Changeset 33645 for trunk

Timestamp:

Apr 1, 2012, 2:12:45 PM (14 years ago)

Author:

eugene

Message:

always read into a valid 2D image, even if input FITS file is 0D, 1D, 2D, or 3D (missing dimensions have size of 1)

File:

• trunk/psLib/src/fits/psFitsImage.c (modified) (2 diffs)

trunk/psLib/src/fits/psFitsImage.c

@@ -97 +97 @@
 
     /* Validate the number of axis */
-    if ((info->nAxis < 2) || (info->nAxis > 3)) {
+    if (info->nAxis > 3) {
         psError(PS_ERR_IO, true,
                 _("Image number of dimensions, %d, is not supported."), info->nAxis);
@@ -108 +108 @@
         goto bad;
     }
+
+    info->nAxes[0] = PS_MAX (info->nAxes[0], 1);
+    info->nAxes[1] = PS_MAX (info->nAxes[1], 1);
+    info->nAxes[2] = PS_MAX (info->nAxes[2], 1);
 
     info->firstPixel[0] = region.x0 + 1;