Changeset 33638 for branches/eam_branches/ipp-20111122/psModules/src/imcombine/pmSubtractionMatch.c

Timestamp:

Mar 30, 2012, 2:49:37 PM (14 years ago)

Author:

eugene

Message:

merge changes from trunk

File:

• branches/eam_branches/ipp-20111122/psModules/src/imcombine/pmSubtractionMatch.c (modified) (3 diffs)

branches/eam_branches/ipp-20111122/psModules/src/imcombine/pmSubtractionMatch.c

@@ -53 +53 @@
     fprintf(stderr, "    Memory in use: %zd\n", totalSize);
     fprintf(stderr, "    Largest block: %ld\n", largest);
+    //MEH -- osx may not like sbrk
     fprintf(stderr, "    sbrk(): %zd\n", (size_t)sbrk(0));
 #endif
@@ -122 +123 @@
         PS_ASSERT_FLOAT_LESS_THAN(sysError, 1.0, false);
     }
-    if (isfinite(sysError)) {
+    if (isfinite(skyError)) {
         PS_ASSERT_FLOAT_LARGER_THAN_OR_EQUAL(skyError, 0.0, false);
     }
@@ -1091 +1092 @@
     }
 
-    if (!psThreadPoolWait(true)) {
+    if (!psThreadPoolWait(true, true)) {
         psError(psErrorCodeLast(), false, "Error waiting for threads.");
         psFree(models);