Changeset 23688 for trunk/psModules/src/imcombine

Timestamp:

Apr 2, 2009, 2:51:37 PM (17 years ago)

Author:

Paul Price

Message:

Merging in branches/pap/ from r23685. Some conflicts, most notably in ippTools, but these resolved fairly simply. Only question mark is on regtool reversion, but I think I got it right. Everything builds fine.

Location:

trunk

Files:

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

trunk/psModules/src/imcombine/pmSubtractionMatch.c

@@ -18 +18 @@
 #include "pmSubtractionMask.h"
 #include "pmSubtractionThreads.h"
+#include "pmSubtractionVisual.h"
+#include "pmErrorCodes.h"
+
 #include "pmSubtractionMatch.h"
-#include "pmSubtractionVisual.h"
 
 #define BG_STAT PS_STAT_ROBUST_MEDIAN   // Statistic to use for background
@@ -73 +75 @@
                                       stampSpacing, mode);
     if (!*stamps) {
-        psError(PS_ERR_UNKNOWN, false, "Unable to find stamps.");
+        psError(psErrorCodeLast(), false, "Unable to find stamps.");
         return false;
     }

trunk/psModules/src/imcombine/pmSubtractionStamps.c

@@ -20 +20 @@
 #include "pmModel.h"
 #include "pmSource.h"
-
+#include "pmErrorCodes.h"
 
 #include "pmSubtraction.h"
@@ -355 +355 @@
     if (numGood == 0 && numFound == 0) {
         // No good stamps
+        psError(PM_ERR_STAMPS, true, "Unable to find suitable stamps");
         psFree(stamps);
         return NULL;