Changeset 16476 for trunk/psModules/src/imcombine/pmSubtraction.c

Timestamp:

Feb 14, 2008, 1:18:34 PM (18 years ago)

Author:

Paul Price

Message:

Fixing regions to allow convolution of sub-images (for ppStack)

File:

• trunk/psModules/src/imcombine/pmSubtraction.c (modified) (2 diffs)

trunk/psModules/src/imcombine/pmSubtraction.c

@@ -4 +4 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.78 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2008-02-14 00:13:09 $
+ *  @version $Revision: 1.79 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-02-14 23:18:34 $
  *
  *  Copyright 2004-2007 Institute for Astronomy, University of Hawaii
@@ -681 +681 @@
         PS_ASSERT_IMAGE_TYPE(out1->weight, PS_TYPE_F32, false);
     }
-    if (region) {
-        if (psRegionIsNaN(*region)) {
-            psString string = psRegionToString(*region);
-            psError(PS_ERR_BAD_PARAMETER_VALUE, true, "Input region (%s) contains NAN values", string);
-            psFree(string);
-            return false;
-        }
-        if (region->x0 < 0 || region->x1 > ro1->image->numCols ||
-            region->y0 < 0 || region->y1 > ro1->image->numRows) {
-            psString string = psRegionToString(*region);
-            psError(PS_ERR_BAD_PARAMETER_VALUE, true, "Input region (%s) does not fit in image (%dx%d)",
-                    string, ro1->image->numCols, ro1->image->numRows);
-            psFree(string);
-            return false;
-        }
+    if (region && psRegionIsNaN(*region)) {
+        psString string = psRegionToString(*region);
+        psError(PS_ERR_BAD_PARAMETER_VALUE, true, "Input region (%s) contains NAN values", string);
+        psFree(string);
+        return false;
     }