Changeset 31156 for trunk/ppSub/src/ppSubConvolve.c

Timestamp:

Apr 4, 2011, 1:13:59 PM (15 years ago)

Author:

eugene

Message:

minor fixes from eam branch

Location:

trunk/ppSub

Files:

• . (modified) (1 prop)
• src/ppSubConvolve.c (modified) (5 diffs)

trunk/ppSub

@@ -17 +17 @@
 test
 Doxyfile
+a.out.dSYM

@@ -17 +17 @@
 test
 Doxyfile
+a.out.dSYM

trunk/ppSub/src/ppSubConvolve.c

@@ -39 +39 @@
 }
 
+void ppSubSetThreads (void) {
+    // ppSub does not have any of its own thread handlers
+    return;
+}
 
 int main(int argc, char *argv[])
@@ -49 +53 @@
         goto die;
     }
+
+    // generic arguments (version, dumpconfig)
+    PS_ARGUMENTS_GENERIC( ppSub, config, argc, argv );
+
+    // thread arguments
+    PS_ARGUMENTS_THREADS( ppSub, config, argc, argv )
 
     bool reference = false;             // Input is actually the reference image?
@@ -59 +69 @@
         psMetadataAddStr(arguments, PS_LIST_TAIL, "-kernel", 0, "Convolution kernel", NULL);
         psMetadataAddBool(arguments, PS_LIST_TAIL, "-reference", 0, "Input is actually reference?", false);
-        psMetadataAddS32(arguments, PS_LIST_TAIL, "-threads", 0, "Threads to use", 0);
         psMetadataAddBool(arguments, PS_LIST_TAIL, "-save-all", 0, "Save all outputs?", false);
 
@@ -75 +84 @@
 
         reference = psMetadataLookupBool(NULL, arguments, "-reference");
-        threads = psMetadataLookupS32(NULL, arguments, "-threads");
+        threads = psMetadataLookupS32(NULL, arguments, "NTHREADS");
         fileList("PPSUB.INPUT", inImage, "Input image", config);
         fileList("PPSUB.INPUT.MASK", inMask, "Input mask", config);
@@ -239 +248 @@
         if (threads > 0) {
             pmSubtractionThreadsInit();
-            psThreadPoolInit(threads);
         }
 

@@ -17 +17 @@
 test
 Doxyfile
+a.out.dSYM