Changeset 13109 for trunk/pswarp/src/pswarpDataLoad.c

Timestamp:

May 1, 2007, 12:22:03 PM (19 years ago)

Author:

Paul Price

Message:

Adding error checking on astrometry read.

File:

• trunk/pswarp/src/pswarpDataLoad.c (modified) (2 diffs)

trunk/pswarp/src/pswarpDataLoad.c

@@ -60 +60 @@
     }
     if (bilevelAstrometry) {
-        pmAstromReadBilevelMosaic (input->fpa, phu->header);
+        if (!pmAstromReadBilevelMosaic(input->fpa, phu->header)) {
+            psError(PS_ERR_UNKNOWN, false, "Unable to read bilevel mosaic astrometry for input FPA.");
+            psFree(view);
+            return false;
+        }
     }
 
@@ -74 +78 @@
         pmHDU *hdu = pmFPAviewThisHDU (view, astrom->fpa);
         if (bilevelAstrometry) {
-            pmAstromReadBilevelChip (chip, hdu->header);
+            if (!pmAstromReadBilevelChip (chip, hdu->header)) {
+                psError(PS_ERR_UNKNOWN, false, "Unable to read bilevel chip astrometry for input FPA.");
+                psFree(view);
+                return false;
+            }
         } else {
             // we use a default FPA pixel scale of 1.0
-            pmAstromReadWCS (input->fpa, chip, hdu->header, 1.0);
+            if (!pmAstromReadWCS (input->fpa, chip, hdu->header, 1.0)) {
+                psError(PS_ERR_UNKNOWN, false, "Unable to read WCS astrometry for input FPA.");
+                psFree(view);
+                return false;
+            }
         }