Changeset 13844

Timestamp:

Jun 14, 2007, 5:08:34 PM (19 years ago)

Author:

eugene

Message:

require input, output, outMask, outWeight to agree in dataLevel, freeLevel

File:

• trunk/ppImage/src/ppImageParseCamera.c (modified) (1 diff)

trunk/ppImage/src/ppImageParseCamera.c

@@ -261 +261 @@
     output->fileLevel = PS_MIN (output->fileLevel, output->dataLevel);
 
+    // outMask and outWeight must be freed at the same level as output (all freed by pmFPAFreeData)
+    outMask->freeLevel   = output->freeLevel;
+    outWeight->freeLevel = output->freeLevel;
+    outMask->dataLevel   = output->dataLevel;
+    outWeight->dataLevel = output->dataLevel;
+
+    // the input data is the same as the output data : force the free levels to match
+    input->freeLevel = PS_MIN (output->freeLevel, input->freeLevel);
+
     // define the binned target files (which may just be carriers for some camera configurations)
     pmFPAfile *bin1 = pmFPAfileDefineFromFPA (config, byChip->fpa, options->xBin1, options->yBin1, "PPIMAGE.BIN1");