Changeset 31443 for branches/eam_branches/ipp-20110404/psModules/src/imcombine/pmStackReject.c

Timestamp:

May 5, 2011, 10:11:07 AM (15 years ago)

Author:

eugene

Message:

merging updates from trunk

File:

• branches/eam_branches/ipp-20110404/psModules/src/imcombine/pmStackReject.c (modified) (1 diff)

branches/eam_branches/ipp-20110404/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) {
+      psTrace("psModules.imcombine",2,"Do not have the necessary kernels and regions, returning input pixels.");
+      psPixels *out = psPixelsCopy(NULL,in);
+      return out;
+    }
+    
     PS_ASSERT_ARRAY_NON_NULL(subRegions, NULL);
     PS_ASSERT_ARRAY_NON_NULL(subKernels, NULL);