Changeset 18508

Timestamp:

Jul 14, 2008, 11:28:46 AM (18 years ago)

Author:

Paul Price

Message:

Fix to allow an image to have no pixels to inspect/reject.

Location:

trunk

Files:

• ppStack/src/ppStackLoop.c (modified) (3 diffs)
• psModules/src/imcombine/pmStackReject.c (modified) (1 diff)

trunk/ppStack/src/ppStackLoop.c

@@ -15 +15 @@
 
 #define WCS_TOLERANCE 0.001             // Tolerance for WCS
+#define PIXELS_BUFFER 1024              // Initial size of pixel lists
 
 // Here follows lists of files for activation/deactivation at various stages.  Each must be NULL-terminated.
@@ -576 +577 @@
                 continue;
             }
-            psPixels *inspect = NULL;   // Inspection list for this readout
+            psPixels *inspect = psPixelsAllocEmpty(PIXELS_BUFFER); // Inspection list for this readout
             psMetadataIterator *iter = psMetadataIteratorAlloc(ro->analysis, PS_LIST_HEAD,
                                                                "^" PPSTACK_INSPECT_PIXELS "$"); // Iterator
@@ -592 +593 @@
             pmReadoutFreeData(ro);
 
-            psLogMsg("ppStack", PS_LOG_INFO, "%ld total pixels to inspect from image %d",
-                     inspect ? inspect->n : 0, i);
+            psLogMsg("ppStack", PS_LOG_INFO, "%ld total pixels to inspect from image %d", inspect->n, i);
 
             psPixels *reject = pmStackReject(inspect, NULL, threshold, subRegions->data[i],

trunk/psModules/src/imcombine/pmStackReject.c

@@ -23 +23 @@
     PS_ASSERT_ARRAY_NON_NULL(kernels, NULL);
     PS_ASSERT_ARRAYS_SIZE_EQUAL(subRegions, kernels, NULL);
+
+    // Trivial case
+    if (in->n == 0) {
+        return psPixelsAllocEmpty(0);
+    }
 
     // Get the original image size