Changeset 27517 for branches/eam_branches/20100225/psModules/src/imcombine/pmSubtractionThreads.c

Timestamp:

Mar 29, 2010, 3:55:49 PM (16 years ago)

Author:

eugene

Message:

update merges from trunk

Location:

branches/eam_branches/20100225

Files:

• . (modified) (1 prop)
• psModules/src/imcombine/pmSubtractionThreads.c (modified) (4 diffs)

branches/eam_branches/20100225/psModules/src/imcombine/pmSubtractionThreads.c

@@ -17 +17 @@
 }
 
-// Initialise a mutex in each of the input
-static void subtractionMutexInit(pmReadout *ro)
-{
-    if (!ro) {
-        return;
-    }
-
-    // XXX if (ro->image) {
-    // XXX     psMutexInit(ro->image);
-    // XXX }
-    // XXX if (ro->variance) {
-    // XXX     psMutexInit(ro->variance);
-    // XXX }
-
-    return;
-}
-
-static void subtractionMutexDestroy(pmReadout *ro)
-{
-    if (!ro) {
-        return;
-    }
-
-    // XXX if (ro->image) {
-    // XXX     psMutexDestroy(ro->image);
-    // XXX }
-    // XXX if (ro->variance) {
-    // XXX     psMutexDestroy(ro->variance);
-    // XXX }
-
-    return;
-}
-
-void pmSubtractionThreadsInit(pmReadout *in1, pmReadout *in2)
+void pmSubtractionThreadsInit(void)
 {
     if (threaded) {
@@ -57 +24 @@
 
     threaded = true;
-
-    subtractionMutexInit(in1);
-    subtractionMutexInit(in2);
 
     {
@@ -86 +50 @@
 
 
-void pmSubtractionThreadsFinalize(pmReadout *in1, pmReadout *in2)
+void pmSubtractionThreadsFinalize(void)
 {
     if (!threaded) {
@@ -97 +61 @@
     psThreadTaskRemove("PSMODULES_SUBTRACTION_CONVOLVE");
 
-    subtractionMutexDestroy(in1);
-    subtractionMutexDestroy(in1);
     return;
 }