Changeset 21363 for trunk/psModules/src/camera/pmFPAfile.c

Timestamp:

Feb 5, 2009, 4:31:25 PM (17 years ago)

Author:

Paul Price

Message:

Merging pap_branch_20090128. Resolved a small number of conflicts. Compiles, but not tested in detail.

File:

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

trunk/psModules/src/camera/pmFPAfile.c

@@ -476 +476 @@
         return PM_FPA_FILE_MASK;
     }
-    if (!strcasecmp(type, "WEIGHT"))     {
-        return PM_FPA_FILE_WEIGHT;
+    if (!strcasecmp(type, "VARIANCE"))     {
+        return PM_FPA_FILE_VARIANCE;
     }
     if (!strcasecmp(type, "FRINGE")) {
@@ -530 +530 @@
       case PM_FPA_FILE_MASK:
         return ("MASK");
-      case PM_FPA_FILE_WEIGHT:
-        return ("WEIGHT");
+      case PM_FPA_FILE_VARIANCE:
+        return ("VARIANCE");
       case PM_FPA_FILE_FRINGE:
         return ("FRINGE");