Changeset 36193 for branches/eam_branches/ipp-20130904/ppImage/src/ppImageParseCamera.c

Timestamp:

Oct 9, 2013, 4:06:36 PM (13 years ago)

Author:

eugene

Message:

merge from trunk

Location:

branches/eam_branches/ipp-20130904/ppImage/src

Files:

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

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

@@ -72 +72 @@
                                PM_FPA_FILE_MASK, PM_DETREND_TYPE_VIDEOMASK)) {
             psError(PS_ERR_IO, false, "Can't find a mask image source");
+            psFree(options);
+            return NULL;
+        }
+      }
+      if (options->doAuxMask) {
+        if (!ppImageDefineFile(config, input->fpa, "PPIMAGE.AUXMASK", "MASK",
+                               PM_FPA_FILE_MASK, PM_DETREND_TYPE_AUXMASK)) {
+            psError(PS_ERR_IO, false, "Can't find a auxillary mask image source");
             psFree(options);
             return NULL;