Changeset 35747 for branches/eam_branches/ipp-20130509/ppImage/src/ppImageParseCamera.c

Timestamp:

Jul 3, 2013, 1:43:50 PM (13 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20130509/ppImage/src

Files:

• . (modified) (1 prop)
• ppImageParseCamera.c (modified) (1 diff)

branches/eam_branches/ipp-20130509/ppImage/src/ppImageParseCamera.c

@@ -184 +184 @@
         }
         outCTE->save = true;
+    }
+    if (options->doApplyBurntool) {
+        // If no burntool file was supplied do not fail. (camera_exp.pl does not supply it
+        // for example.
+        if (!psMetadataLookupStr(NULL, config->arguments, "BURNTOOL.TABLE")) {
+            psWarning("BURNTOOL.TABLE not supplied setting doApplyBurntool to false");
+            options->doApplyBurntool = false;
+        }
     }