Changeset 21363 for trunk/psModules/src/imcombine/pmSubtractionThreads.c

Timestamp:

Feb 5, 2009, 4:31:25 PM (17 years ago)

Author:

Paul Price

Message:

Merging pap_branch_20090128. Resolved a small number of conflicts. Compiles, but not tested in detail.

File:

• trunk/psModules/src/imcombine/pmSubtractionThreads.c (modified) (2 diffs)

trunk/psModules/src/imcombine/pmSubtractionThreads.c

@@ -27 +27 @@
     // XXX     psMutexInit(ro->image);
     // XXX }
-    // XXX if (ro->weight) {
-    // XXX     psMutexInit(ro->weight);
+    // XXX if (ro->variance) {
+    // XXX     psMutexInit(ro->variance);
     // XXX }
 
@@ -43 +43 @@
     // XXX     psMutexDestroy(ro->image);
     // XXX }
-    // XXX if (ro->weight) {
-    // XXX     psMutexDestroy(ro->weight);
+    // XXX if (ro->variance) {
+    // XXX     psMutexDestroy(ro->variance);
     // XXX }