Changeset 7698 for trunk/ppMerge/src/ppMerge.c

Timestamp:

Jun 26, 2006, 4:55:09 PM (20 years ago)

Author:

Paul Price

Message:

Updating following changes to pmConfigRead and pmConfig.

File:

• trunk/ppMerge/src/ppMerge.c (modified) (2 diffs)

trunk/ppMerge/src/ppMerge.c

@@ -21 +21 @@
 int main(int argc, char **argv)
 {
-    psMemThreadSafety(false);           // Turn off thread safety, for more
+    psMemSetThreadSafety(false);           // Turn off thread safety, for more
     psTimerStart(TIMERNAME);
 
@@ -28 +28 @@
     // Determine camera, format from header if not already defined
     // Construct camera in preparation for reading
-    pmConfig *config = ppMergeConfig(&argc, argv);
+    pmConfig *config = ppMergeConfig(argc, argv);
 
     // Set various tasks (define optional operations)