Changeset 33198

Timestamp:

Feb 2, 2012, 2:05:23 PM (14 years ago)

Author:

eugene

Message:

FITS images with 0 or 1 dimensions are read into a 2D image with 1 element in the reduced dimension. for a 1D input image, this means a 2D image of Nx * 1 pixels, which is pretty clearly what you want; for a 0D image, there is no data, but a 2D 1x1 image is generated -- it should be filled with a NaN value

File:

• branches/eam_branches/ipp-20111122/psLib/src/fits/psFitsImage.c (modified) (2 diffs)

branches/eam_branches/ipp-20111122/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;