Changeset 7496 for trunk/psLib/src/math/psRegion.c

Timestamp:

Jun 9, 2006, 6:01:43 PM (20 years ago)

Author:

magnier

Message:

two changes to the behavior of psRegionFromString:
1) [0:0,0:0] returns the region (0,0,0,0), despite minor inconsistency

with the IRAF convention

2) col1,row1 <= 0 are allowed and returned intact (to result in meaning

of 'xxx from upper end of region'

File:

• trunk/psLib/src/math/psRegion.c (modified) (1 diff)

trunk/psLib/src/math/psRegion.c

@@ -51 +51 @@
     }
 
-    if (col0 > col1 || row0 > row1) {
+    // [0:0,0:0] is complete image region
+    if ((col0 == 0) && (col1 == 0) && (row0 == 0) && (row1 == 0)) {
+        return psRegionSet(0,0,0,0);
+    }
+
+    if ((col1 > 0) && (col0 > col1)) {
+        psError(PS_ERR_BAD_PARAMETER_VALUE, true,
+                PS_ERRORTEXT_psImage_SUBSET_RANGE_MALFORMED,
+                col0,col1,row0,row1);
+        return psRegionSet(NAN,NAN,NAN,NAN);
+    }
+
+    if ((row1 > 0) && (row0 > row1)) {
         psError(PS_ERR_BAD_PARAMETER_VALUE, true,
                 PS_ERRORTEXT_psImage_SUBSET_RANGE_MALFORMED,