Changeset 38063

Timestamp:

Mar 29, 2015, 8:04:56 AM (11 years ago)

Author:

eugene

Message:

merge changes from tags/ipp-20150312 (set inConf and refConf I/O options from filerules)

Location:

trunk/ppSub

Files:

• . (modified) (1 prop)
• src/ppSubCamera.c (modified) (4 diffs)

trunk/ppSub/src/ppSubCamera.c

@@ -268 +268 @@
     }
     // these ->save values below are set by command-line arguments (in ppSubArguments.c) : -save-inconv, -save-refconv
-    inConvImage->save = data->saveInConv;
-    inConvMask->save = data->saveInConv;
+    checkFileruleFileSave (inConvImage, config);
+    inConvImage->save = inConvImage->save || data->saveInConv;
+
+    checkFileruleFileSave (inConvMask, config);
+    inConvMask->save = inConvMask->save || data->saveInConv;
     if (inVar) {
         pmFPAfile *inConvVar = defineOutputFile(config, inConvImage, false, "PPSUB.INPUT.CONV.VARIANCE",
@@ -277 +280 @@
             return false;
         }
-        inConvVar->save = data->saveInConv;
+        checkFileruleFileSave (inConvVar, config);
+        inConvVar->save = inConvVar->save || data->saveInConv;
     }
 
@@ -288 +292 @@
         return false;
     }
-    refConvImage->save = data->saveRefConv;
-    refConvMask->save = data->saveRefConv;
+    checkFileruleFileSave (refConvImage, config);
+    refConvImage->save = refConvImage->save || data->saveRefConv;
+
+    checkFileruleFileSave (refConvMask, config);
+    refConvMask->save = refConvMask->save || data->saveRefConv;
     if (refVar) {
         pmFPAfile *refConvVar = defineOutputFile(config, refConvImage, false, "PPSUB.REF.CONV.VARIANCE",
@@ -297 +304 @@
             return false;
         }
-        refConvVar->save = data->saveRefConv;
+        checkFileruleFileSave (refConvVar, config);
+        refConvVar->save = refConvVar->save || data->saveRefConv;
     }