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

Timestamp:

Nov 10, 2008, 2:04:47 PM (17 years ago)

Author:

eugene

Message:

pmConfigCameraFrmatFromHeader returns camera name as well as format name

File:

• trunk/psModules/src/camera/pmFPAfileIO.c (modified) (3 diffs)

trunk/psModules/src/camera/pmFPAfileIO.c

@@ -783 +783 @@
           psMetadata *camera = NULL;
           psString formatName = NULL;
-          file->format = pmConfigCameraFormatFromHeader (&camera, &formatName, config, phu, true);
+          psString cameraName = NULL;
+          file->format = pmConfigCameraFormatFromHeader (&camera, &cameraName, &formatName, config, phu, true);
           if (!file->format) {
             psError(PS_ERR_IO, false, "Failed to read CCD format from %s\n", file->filename);
@@ -800 +801 @@
           psFree(camera);
           psFree(formatName);
+          psFree(cameraName);
 
           // XXX this is really dangerous...
@@ -894 +896 @@
     if (!file->format) {
         // determine the format (camera is already known); do not load the recipe
-        file->format = pmConfigCameraFormatFromHeader (NULL, &file->formatName, config, phu, false);
+        file->format = pmConfigCameraFormatFromHeader (NULL, NULL, &file->formatName, config, phu, false);
         if (!file->format) {
             psError(PS_ERR_IO, false, "Failed to read CCD format from %s\n", file->filename);