Changeset 35236 for branches/eam_branches/ipp-20130207/ppStack/src/ppStackLoop.c

Timestamp:

Mar 5, 2013, 2:24:05 PM (13 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20130207

Files:

• . (modified) (1 prop)
• ppStack/src/ppStackLoop.c (modified) (2 diffs)

branches/eam_branches/ipp-20130207/ppStack/src/ppStackLoop.c

@@ -63 +63 @@
     }
 
-    bool doBackground = psMetadataLookupBool(NULL, recipe, "BACKGROUND.MODEL");
+    //    bool doBackground = psMetadataLookupBool(NULL, recipe, "BACKGROUND.MODEL");
 
     // Prepare for combination
-    if (!ppStackCombinePrepare("PPSTACK.OUTPUT", "PPSTACK.OUTPUT.EXP", doBackground ? "PPSTACK.OUTPUT.BKGMODEL" : NULL, PPSTACK_FILES_STACK, stack, options, config)) {
+    if (!ppStackCombinePrepare("PPSTACK.OUTPUT", "PPSTACK.OUTPUT.EXP", options->doBackground ? "PPSTACK.OUTPUT.BKGMODEL" : NULL, PPSTACK_FILES_STACK, stack, options, config)) {
         psError(psErrorCodeLast(), false, "Unable to prepare for combination.");
         psFree(stack);
@@ -146 +146 @@
 
     // Generate median background stack here.
-    if (doBackground && !ppStackCombineBackground(stack, options, config)) {
+    if (options->doBackground && !ppStackCombineBackground(stack, options, config)) {
       psError(psErrorCodeLast(), false, "Unable to generate median of background images.");
       psFree(stack);