Changeset 27004 for trunk/psModules

Timestamp:

Feb 18, 2010, 6:42:01 PM (16 years ago)

Author:

Paul Price

Message:

Reworked ppStack to be better about error codes and their translation to exit codes.

Location:

trunk/psModules/src/imcombine

Files:

• pmStack.c (modified) (1 diff)
• pmStackReject.c (modified) (4 diffs)

trunk/psModules/src/imcombine/pmStack.c

@@ -1008 +1008 @@
     if (!pmReadoutStackValidate(&minInputCols, &maxInputCols, &minInputRows, &maxInputRows, &xSize, &ySize,
                                 stack)) {
-        psError(PS_ERR_UNKNOWN, false, "Input stack is not valid.");
+        psError(psErrorCodeLast(), false, "Input stack is not valid.");
         psFree(stack);
         return false;

trunk/psModules/src/imcombine/pmStackReject.c

@@ -158 +158 @@
         if (!pmSubtractionConvolve(NULL, convRO, NULL, inRO, NULL, stride, 0, 0, 1.0, 0.0, 0.0,
                                    region, kernels, false, true)) {
-            psError(PS_ERR_UNKNOWN, false, "Unable to convolve mask image in region %d.", i);
+            psError(psErrorCodeLast(), false, "Unable to convolve mask image in region %d.", i);
             psFree(convRO);
             psFree(inRO);
@@ -170 +170 @@
         psImage *kernel = pmSubtractionKernelImage(kernels, 0.5, 0.5, false);
         if (!kernel) {
-            psError(PS_ERR_UNKNOWN, false, "Unable to generate kernel image.");
+            psError(psErrorCodeLast(), false, "Unable to generate kernel image.");
             psFree(convRO);
             psFree(inRO);
@@ -283 +283 @@
                 } else if (!stackRejectGrow(target, source, kernels, numCols, numRows,
                                             i, xSubMax, j, ySubMax, poorFrac)) {
-                    psError(PS_ERR_UNKNOWN, false, "Unable to grow bad pixels.");
+                    psError(psErrorCodeLast(), false, "Unable to grow bad pixels.");
                     psFree(source);
                     psFree(target);
@@ -293 +293 @@
 
     if (!psThreadPoolWait(false)) {
-        psError(PS_ERR_UNKNOWN, false, "Unable to grow bad pixels.");
+        psError(psErrorCodeLast(), false, "Unable to grow bad pixels.");
         psFree(source);
         psFree(target);