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

Timestamp:

Jan 22, 2008, 5:10:51 PM (18 years ago)

Author:

Paul Price

Message:

Merging pap_branch_080117 into the mainline.

File:

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

trunk/psModules/src/camera/pmFPAfileIO.c

@@ -685 +685 @@
         psMetadata *menu = psMetadataLookupMetadata(&status, file->camera, "CLASSID"); // Menu of class IDs
         if (!status || !menu) {
-            psError(PS_ERR_IO, false, "Unable to find CLASSID metadata in camera configuration");
-            return false;
-        } 
-        const char *rule = psMetadataLookupStr(&status, menu, file->detrend->level); // Rule for class_id
-        if (!status || !rule || strlen(rule) == 0) {
-            psError(PS_ERR_IO, false, "Unable to find %s in CLASSID in camera configuration", file->detrend->level);
-            return false;
-        } 
-        classId = pmFPAfileNameFromRule(rule, file, view);
-        if (!classId) {
-            psError(PS_ERR_IO, false, "error converting CLASSID rule to name: %s\n", rule);
-            return false;
-        }
+            psError(PS_ERR_IO, false, "Unable to find CLASSID metadata in camera configuration");
+            return false;
+        }
+        const char *rule = psMetadataLookupStr(&status, menu, file->detrend->level); // Rule for class_id
+        if (!status || !rule || strlen(rule) == 0) {
+            psError(PS_ERR_IO, false, "Unable to find %s in CLASSID in camera configuration", file->detrend->level);
+            return false;
+        }
+        classId = pmFPAfileNameFromRule(rule, file, view);
+        if (!classId) {
+            psError(PS_ERR_IO, false, "error converting CLASSID rule to name: %s\n", rule);
+            return false;
+        }
         psTrace ("psModules.camera", 6, "looking for detrend (%s, %s)\n", file->detrend->detID, classId);
         psFree (file->filename);
@@ -751 +751 @@
         }
 
-        // XXX these are probably only needed for WRITE files
+        // XXX these are probably only needed for WRITE files
         if (file->compression) {
             psTrace("psModules.camera", 7, "Setting compression for %s (%s)\n", file->filename, file->name);
@@ -761 +761 @@
         }
 
-        file->fits->floatType = file->floatType;
-        file->fits->bitpix = file->bitpix;
+        file->fits->options = psMemIncrRefCounter(file->options);
 
         // In some cases, we need to read the PHU after we've opened the file.  This happens for the images