Changeset 25027 for branches/pap/ppMerge/src/ppMergeCamera.c

Timestamp:

Aug 7, 2009, 4:08:25 PM (17 years ago)

Author:

Paul Price

Message:

Merging trunk (r25026) to get up-to-date on old branch.

Location:

branches/pap

Files:

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

branches/pap/ppMerge/src/ppMergeCamera.c

@@ -337 +337 @@
       case PPMERGE_TYPE_FRINGE:
         fileType = PM_FPA_FILE_FRINGE;
+        break;
       default:
         psAbort("Unknown frame type: %x", type);