Changeset 12756

Timestamp:

Apr 5, 2007, 1:57:42 PM (19 years ago)

Author:

Paul Price

Message:

Only attempt variance or mask interpolation if the image is provided.

File:

• trunk/psLib/src/imageops/psImageInterpolate.c (modified) (8 diffs)

trunk/psLib/src/imageops/psImageInterpolate.c

@@ -7 +7 @@
  *  @author Paul Price, IfA
  *
- *  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-04-04 22:42:02 $
+ *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-04-05 23:57:42 $
  *
  *  Copyright 2004-2007 Institute for Astronomy, University of Hawaii
@@ -95 +95 @@
                 *imageValue = options->image->data.TYPE[yInt][xInt]; \
             } \
-            if (varianceValue) { \
+            if (varianceValue && options->variance) { \
                 *varianceValue = options->variance->data.TYPE[yInt][xInt]; \
             } \
@@ -118 +118 @@
         }
 
-        if (maskValue) {
+        if (maskValue && options->mask) {
             *maskValue = options->mask->data.PS_TYPE_MASK_DATA[yInt][xInt];
         }
@@ -256 +256 @@
 
     // Check the mask value
-    if (maskValue) {
-        const psImage *mask = options->mask; // Image mask
+    const psImage *mask = options->mask; // Image mask
+    if (maskValue && mask) {
         psMaskType maskVal = options->maskVal; // Mask value
         double badValue = 0.0;          // Amount of flux in bad pixels
@@ -282 +282 @@
 
     // Finally, the variance
-    if (varianceValue) {
-        const psImage *variance = options->variance; // Image variance
+    const psImage *variance = options->variance; // Image variance
+    if (varianceValue && variance) {
         *varianceValue = 0.0;
 
@@ -469 +469 @@
 
     // Check the mask value
-    if (maskValue) {
-        const psImage *mask = options->mask; // Image mask
+    const psImage *mask = options->mask; // Image mask
+    if (maskValue && mask) {
         psMaskType maskVal = options->maskVal; // Mask value
         double badValue = 0.0;          // Amount of flux in bad pixels
@@ -499 +499 @@
 
     // Finally, the variance
-    if (varianceValue) {
-        const psImage *variance = options->variance; // Image variance
+    const psImage *variance = options->variance; // Image variance
+    if (varianceValue && variance) {
         *varianceValue = 0.0;
 
@@ -549 +549 @@
 
     PS_ASSERT_IMAGE_NON_NULL(image, false);
-    if (varianceValue) {
+    if (varianceValue && variance) {
         PS_ASSERT_IMAGE_NON_NULL(variance, false);
         PS_ASSERT_IMAGE_TYPE(variance, image->type.type, false);
         PS_ASSERT_IMAGES_SIZE_EQUAL(variance, image, false);
     }
-    if (maskValue) {
+    if (maskValue && mask) {
         PS_ASSERT_IMAGE_NON_NULL(mask, false);
         PS_ASSERT_IMAGE_TYPE(mask, PS_TYPE_MASK, false);