Changeset 11242 for trunk/psModules/src/camera/pmFPAfileIO.c

Timestamp:

Jan 22, 2007, 5:18:21 PM (19 years ago)

Author:

magnier

Message:

correctly handle invalid camera format vs config error

File:

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

trunk/psModules/src/camera/pmFPAfileIO.c

@@ -89 +89 @@
                 }
             } else {
-                pmConfigValidateCameraFormat (file->format, phu);
+                bool valid;
+                if (!pmConfigValidateCameraFormat (&valid, file->format, phu)) {
+                    psError (PS_ERR_UNKNOWN, false, "Error in config scripts\n");
+                    psFree (phu);
+                    return NULL;
+                }
+                if (!valid) {
+                    psError(PS_ERR_IO, false, "file %s is not from the required camera", file->filename);
+                    psFree (phu);
+                    return NULL;
+                }
             }
             pmFPAview *thisView = pmFPAAddSourceFromHeader (file->fpa, phu, file->format);