Changeset 19033

Timestamp:

Aug 12, 2008, 12:42:17 PM (18 years ago)

Author:

eugene

Message:

fallback on IMNAXIS1,2 if NAXIS1,2 are missing

File:

• trunk/psModules/src/camera/pmFPAExtent.c (modified) (1 diff)

trunk/psModules/src/camera/pmFPAExtent.c

@@ -25 +25 @@
         pmHDU *hdu = pmHDUFromReadout (readout);
         if (hdu && hdu->header) {
-            xSize = psMetadataLookupS32(NULL, hdu->header, "NAXIS1");
-            ySize = psMetadataLookupS32(NULL, hdu->header, "NAXIS2");
+            bool status;
+            xSize = psMetadataLookupS32(&status, hdu->header, "NAXIS1");
+            if (!status) {
+                xSize = psMetadataLookupS32(&status, hdu->header, "IMNAXIS1");
+                if (!status) return NULL;
+            }           
+            ySize = psMetadataLookupS32(&status, hdu->header, "NAXIS2");
+            if (!status) {
+                ySize = psMetadataLookupS32(&status, hdu->header, "IMNAXIS2");
+                if (!status) return NULL;
+            }           
         } else {
         // Don't have anything to base the true extent on, so have to give the hardwired value (largest possible extent)