[Hugin-cvs] /hgrepo/h/hu/hugin/hugin: Fixes compression for exposure layers ...

[<hug...@li...>]

branch:    
details:   http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/44194bf21d5b
changeset: 5149:44194bf21d5b
user:      tmodes
date:       Tue Mar 15 20:55:30 2011 +0100
description:
Fixes compression for exposure layers output

diffstat:

 src/hugin_base/algorithms/panorama_makefile/PanoramaMakefilelibExport.cpp |  16 +++++++-
 1 files changed, 15 insertions(+), 1 deletions(-)

diffs (40 lines):

diff -r 42c62d1786ee -r 44194bf21d5b src/hugin_base/algorithms/panorama_makefile/PanoramaMakefilelibExport.cpp
--- a/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefilelibExport.cpp	Sun Mar 20 23:59:46 2011 -0400
+++ b/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefilelibExport.cpp	Tue Mar 15 20:55:30 2011 +0100
@@ -256,6 +256,7 @@
     // set blender specific settings
     mf::Variable* venblendopts = nullvar;
     mf::Variable* venblendldrcomp = nullvar;
+    mf::Variable* venblendexposurecomp = nullvar;
     mf::Variable* venblendhdrcomp = nullvar;
 
     if(opts.blendMode == PanoramaOptions::ENBLEND_BLEND)
@@ -289,6 +290,17 @@
 
         {
             makefile::string val;
+            if (opts.outputImageType == "tif" && opts.outputLayersCompression.size() != 0)
+                val = "--compression=" + opts.outputLayersCompression;
+            else if (opts.outputImageType == "jpg")
+                val = "--compression=LZW ";
+
+            venblendexposurecomp = mgr.own(new mf::Variable("ENBLEND_EXPOSURE_COMP", val, Makefile::NONE));
+            venblendexposurecomp->getDef().add();
+       }
+
+       {
+            makefile::string val;
             if (opts.outputImageTypeHDR == "tif" && opts.outputImageTypeHDRCompression.size() != 0) {
                 val += "--compression=" + opts.outputImageTypeHDRCompression;
             }
@@ -886,7 +898,9 @@
             rule = mgr.own(new Rule()); rule->add();
             rule->addTarget(ldrexp_stacks[i]);
             rule->addPrereq(ldrexp_stacks_input[i]);
-            rule->addCommand(enblendcmd + ldrexp_stacks_shell[i]->getRef() +" "+ ldrexp_stacks_input_shell[i]->getRef());
+            rule->addCommand(venblend->getRef() +" "+ venblendexposurecomp->getRef() + " " +
+                venblendopts->getRef() + " -o " + ldrexp_stacks_shell[i]->getRef() + " " + 
+                ldrexp_stacks_input_shell[i]->getRef());
             rule->addCommand(exifcmd + ldrexp_stacks_shell[i]->getRef());
         }