Changeset 9438 for trunk/ppImage/src/ppImageParseCamera.c

Timestamp:

Oct 9, 2006, 3:10:28 PM (20 years ago)

Author:

eugene

Message:

adding error checks

File:

• trunk/ppImage/src/ppImageParseCamera.c (modified) (5 diffs)

trunk/ppImage/src/ppImageParseCamera.c

@@ -33 +33 @@
         pmFPAfileDefineFromConf  (&status, config, "PPIMAGE.BIAS");
         pmFPAfileDefineFromDetDB (&status, config, "PPIMAGE.BIAS", input->fpa, PM_DETREND_TYPE_BIAS);
-        if (!status) psAbort ("ppImageParseDetrend", "can't find a bias image source");
+        if (!status) {
+            psError (PS_ERR_IO, false, "can't find a bias image source");
+            return NULL;
+        }
     }
     if (options->doDark) {
@@ -40 +43 @@
         pmFPAfileDefineFromConf  (&status, config, "PPIMAGE.DARK");
         pmFPAfileDefineFromDetDB (&status, config, "PPIMAGE.DARK", input->fpa, PM_DETREND_TYPE_DARK);
-        if (!status) psAbort ("ppImageParseDetrend", "can't find a dark image source");
+        if (!status) {
+            psError (PS_ERR_IO, false, "can't find a dark image source");
+            return NULL;
+        }
     }
     if (options->doMask) {
@@ -47 +53 @@
         pmFPAfileDefineFromConf  (&status, config, "PPIMAGE.MASK");
         pmFPAfileDefineFromDetDB (&status, config, "PPIMAGE.MASK", input->fpa, PM_DETREND_TYPE_MASK);
-        if (!status) psAbort ("ppImageParseDetrend", "can't find a mask image source");
+        if (!status) {
+            psError (PS_ERR_IO, false, "can't find a mask image source");
+            return NULL;
+        }
     }
     if (options->doShutter) {
@@ -54 +63 @@
         pmFPAfileDefineFromConf  (&status, config, "PPIMAGE.SHUTTER");
         pmFPAfileDefineFromDetDB (&status, config, "PPIMAGE.SHUTTER", input->fpa, PM_DETREND_TYPE_FLAT);
-        if (!status) psAbort ("ppImageParseDetrend", "can't find a shutter image source");
+        if (!status) {
+            psError (PS_ERR_IO, false, "can't find a shutter image source");
+            return NULL;
+        }
     }
     if (options->doFlat) {
@@ -61 +73 @@
         pmFPAfileDefineFromConf  (&status, config, "PPIMAGE.FLAT");
         pmFPAfileDefineFromDetDB (&status, config, "PPIMAGE.FLAT", input->fpa, PM_DETREND_TYPE_FLAT);
-        if (!status) psAbort ("ppImageParseDetrend", "can't find a flat image source");
+        if (!status) {
+            psError (PS_ERR_IO, false, "can't find a flat image source");
+            return NULL;
+        }
     }