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

Timestamp:

Mar 23, 2010, 3:23:07 PM (16 years ago)

Author:

Paul Price

Message:

Merging development branch branches/pap_stack/ (exposure maps and their compression).

Location:

trunk

Files:

• . (modified) (1 prop)
• psModules/src/camera/pmFPAfileDefine.c (modified) (3 diffs)

trunk/psModules/src/camera/pmFPAfileDefine.c

@@ -57 +57 @@
         return NAN;
     }
-    int value = psMetadataItemParseF32(item); // Value of interst
+    float value = psMetadataItemParseF32(item); // Value of interst
     return value;
 }
@@ -72 +72 @@
         return NAN;
     }
-    int value = psMetadataItemParseF64(item); // Value of interst
+    double value = psMetadataItemParseF64(item); // Value of interst
     return value;
 }
@@ -313 +313 @@
         }
 
+        psMetadataItem *fuzz = psMetadataLookup(scheme, "FUZZ"); // Quantisation fuzz?
+        if (fuzz) {
+            if (fuzz->type != PS_TYPE_BOOL) {
+                psWarning("FUZZ in compression scheme %s isn't boolean.", fitsType);
+                goto FITS_OPTIONS_DONE;
+            }
+            options->fuzz = fuzz->data.B;
+        }
+
         // Compression options
         const char *compressString = psMetadataLookupStr(&mdok, scheme, "COMPRESSION"); // Compression type