Changeset 24557 for branches/eam_branches/20090522/psModules/src/imcombine/pmSubtractionMatch.c

Timestamp:

Jun 25, 2009, 2:00:56 PM (17 years ago)

Author:

eugene

Message:

merging changes from head

Location:

branches/eam_branches/20090522

Files:

• . (modified) (1 prop)
• psModules (modified) (1 prop)
• psModules/src/imcombine/pmSubtractionMatch.c (modified) (3 diffs)

branches/eam_branches/20090522/psModules/src/imcombine/pmSubtractionMatch.c

@@ -246 +246 @@
                                          badFrac, mode); // Subtraction mask
     if (!subMask) {
-        psError(PS_ERR_UNKNOWN, false, "Unable to generate subtraction mask.");
+        psError(psErrorCodeLast(), false, "Unable to generate subtraction mask.");
         psFree(kernels);
         psFree(regions);
@@ -337 +337 @@
         PS_ASSERT_FLOAT_LESS_THAN_OR_EQUAL(optThreshold, 1.0, false);
     }
-    PS_ASSERT_INT_POSITIVE(iter, false);
+    PS_ASSERT_INT_NONNEGATIVE(iter, false);
     PS_ASSERT_FLOAT_LARGER_THAN(rej, 0.0, false);
 
@@ -379 +379 @@
                                 badFrac, subMode);
     if (!subMask) {
-        psError(PS_ERR_UNKNOWN, false, "Unable to generate subtraction mask.");
+        psError(psErrorCodeLast(), false, "Unable to generate subtraction mask.");
         goto MATCH_ERROR;
     }