Changeset 11801 for trunk/psModules/src/camera/pmFPAfileDefine.c

Timestamp:

Feb 14, 2007, 2:51:20 PM (19 years ago)

Author:

Paul Price

Message:

Fixing issues with file formats: some formats weren't getting the PHU where required (because the create was following the open, and the open was attempting to write the blank PHU). Added pmFPAfileBlank to write a blank where required. Cleaned up the pmFPAfile stuff a little.

File:

• trunk/psModules/src/camera/pmFPAfileDefine.c (modified) (2 diffs)

trunk/psModules/src/camera/pmFPAfileDefine.c

@@ -180 +180 @@
     }
 
-    file->camera = psMemIncrRefCounter(config->camera);
+    psMetadata *camera;                 // Camera to use
+    if (fpa && fpa->camera) {
+        camera = (psMetadata*)fpa->camera; // Casting away const, so I can put it in the file
+    } else {
+        camera = config->camera;
+    }
+    file->camera = psMemIncrRefCounter(camera);
+
+    // select the format list from the selected camera
     const char *formatName = psMetadataLookupStr (&status, data, "FILE.FORMAT");
-    psMetadata *format = NULL;          // Camera format to use
-    if (formatName && strcasecmp(formatName, "NONE") != 0) {
-        // select the format list from the selected camera
-        psMetadata *formats = psMetadataLookupMetadata(&status, file->camera, "FORMATS"); // List of formats
-
-        // select the desired format
-        format = psMetadataLookupMetadata(&status, formats, formatName);
-        if (!format) {
-            psError(PS_ERR_IO, false, "format %s for %s not defined", formatName, name);
-            psFree(file);
-            return NULL;
-        }
-        file->format = psMemIncrRefCounter(format);
-        #if 0
-
-        file->src = psMemIncrRefCounter(fpa);
-        file->fpa = pmFPAConstruct(file->camera);
-        #endif
-
-    } else {
+    if (!formatName) {
+        formatName = config->formatName;
+    }
+    psMetadata *formats = psMetadataLookupMetadata(&status, file->camera, "FORMATS"); // List of formats
+    psMetadata *format = psMetadataLookupMetadata(&status, formats, formatName); // Camera format to use
+    if (!format) {
+        // Try to get by with the default
         format = config->format;
-        #if 0
-
-        file->fpa = psMemIncrRefCounter(fpa);
-        #endif
-
-    }
-    #if 1
+    }
+    file->format = psMemIncrRefCounter(format);
+
     file->fpa = psMemIncrRefCounter(fpa);
-    #endif
-
 
     file->fileLevel = pmFPAPHULevel(format);
@@ -925 +914 @@
     file->xBin = xBin;
     file->yBin = yBin;
-    psFree (file->format);
-    file->format = psMemIncrRefCounter(format);
-
     psFree (fpa);
     return file;