Changeset 25626 for branches/eam_branches/20090715/psModules/src/imcombine/pmSubtractionMatch.c

Timestamp:

Sep 27, 2009, 11:36:17 AM (17 years ago)

Author:

eugene

Message:

merge changes from trunk

File:

• branches/eam_branches/20090715/psModules/src/imcombine/pmSubtractionMatch.c (modified) (1 diff)

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

@@ -628 +628 @@
     variance = NULL;
 
-    if (!pmSubtractionBorder(conv1->image, conv1->variance, conv1->mask, size, maskBad)) {
+    if (conv1 && !pmSubtractionBorder(conv1->image, conv1->variance, conv1->mask, size, maskBad)) {
+        psError(PS_ERR_UNKNOWN, false, "Unable to set border of convolved image.");
+        goto MATCH_ERROR;
+    }
+    if (conv2 && !pmSubtractionBorder(conv2->image, conv2->variance, conv2->mask, size, maskBad)) {
         psError(PS_ERR_UNKNOWN, false, "Unable to set border of convolved image.");
         goto MATCH_ERROR;