Changeset 31203 for trunk/psModules

Timestamp:

Apr 6, 2011, 1:15:47 PM (15 years ago)

Author:

watersc1

Message:

Updates to ppStack to allow CONVOLVE=FALSE stacks to be generated

Location:

trunk/psModules/src/imcombine

Files:

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

trunk/psModules/src/imcombine/pmStack.c

@@ -37 +37 @@
 # if (0)
 #define TESTING                         // Enable test output
-#define TEST_X 340                       // x coordinate to examine
-#define TEST_Y 938                       // y coordinate to examine
+#define TEST_X 3145                       // x coordinate to examine
+#define TEST_Y 2334                       // y coordinate to examine
 #define TEST_RADIUS 0.5                 // Radius to examine
 # endif

trunk/psModules/src/imcombine/pmStackReject.c

@@ -125 +125 @@
     PS_ASSERT_FLOAT_LARGER_THAN_OR_EQUAL(threshold, 0.0, NULL);
     PS_ASSERT_FLOAT_LESS_THAN_OR_EQUAL(threshold, 1.0, NULL);
+
+    if (!subRegions || !subKernels) {
+      psPixels *out = psPixelsCopy(NULL,in);
+      return out;
+    }
+    
     PS_ASSERT_ARRAY_NON_NULL(subRegions, NULL);
     PS_ASSERT_ARRAY_NON_NULL(subKernels, NULL);