Changeset 23594 for branches/cnb_branches/cnb_branch_20090301/ppMerge/src/ppMergeCamera.c

Timestamp:

Mar 29, 2009, 6:15:31 PM (17 years ago)

Author:

beaumont

Message:

merged with head

Location:

branches/cnb_branches/cnb_branch_20090301

Files:

• . (modified) (1 prop)
• ppMerge/src/ppMergeCamera.c (modified) (1 diff)

branches/cnb_branches/cnb_branch_20090301/ppMerge/src/ppMergeCamera.c

@@ -326 +326 @@
         fileType = PM_FPA_FILE_MASK;
         break;
+      case PPMERGE_TYPE_CTEMASK:
+        fileType = PM_FPA_FILE_MASK;
+        break;
       case PPMERGE_TYPE_SHUTTER:
         fileType = PM_FPA_FILE_IMAGE;