Changeset 34041 for branches/meh_branches/ppstack_test/psLib/src/fits/psFitsImage.c

Timestamp:

Jun 19, 2012, 5:24:19 PM (14 years ago)

Author:

mhuber

Message:

merging latest r34040 trunk changes to branch

Location:

branches/meh_branches/ppstack_test

Files:

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

branches/meh_branches/ppstack_test/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;