Changeset 13894

Timestamp:

Jun 19, 2007, 4:16:30 PM (19 years ago)

Author:

Paul Price

Message:

Fixing dataLevel in the event of mosaicking --- the dataLevel when
mosaicking should be elevated to the mosaicLevel if required.

File:

• trunk/psModules/src/camera/pmFPAfileIO.c (modified) (1 diff)

trunk/psModules/src/camera/pmFPAfileIO.c

@@ -312 +312 @@
 
     // the effective dataLevel (for mosaics, we have preserved the original dataLevel)
-    pmFPALevel dataLevel = (file->mosaicLevel != PM_FPA_LEVEL_NONE) ? file->mosaicLevel : file->dataLevel;
+    pmFPALevel dataLevel = file->dataLevel;
+    if (file->mosaicLevel != PM_FPA_LEVEL_NONE && file->mosaicLevel < dataLevel) {
+        dataLevel = file->mosaicLevel;
+    }
 
     // do we need to write this file?