[Hugin-cvs] /hgrepo/h/hu/hugin/hugin: * makefilelib: pass compression param...

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

branch:    
details:   http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/a195d763c5d0
changeset: 4523:a195d763c5d0
user:      Yuval Levy <yu...@us...>
date:       Sun Oct 31 12:49:36 2010 -0400
description:
* makefilelib:  pass compression parameter to enblend/enfuse properly
* Hugin: default to LZW compression instead of PACKBITS

diffstat:

 src/hugin_base/algorithms/panorama_makefile/PanoramaMakefilelibExport.cpp |  8 ++++----
 src/hugin_base/panodata/PanoramaOptions.h                                 |  8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diffs (60 lines):

diff -r 3e7dae57442a -r a195d763c5d0 src/hugin_base/algorithms/panorama_makefile/PanoramaMakefilelibExport.cpp
--- a/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefilelibExport.cpp	Tue Oct 26 20:39:06 2010 +0200
+++ b/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefilelibExport.cpp	Sun Oct 31 12:49:36 2010 -0400
@@ -243,7 +243,7 @@
         if (opts.outputImageType == "tif" && opts.outputLayersCompression.size() != 0)
             val = "-z " + opts.outputLayersCompression;
         else if (opts.outputImageType == "jpg")
-            val = "-z PACKBITS ";
+            val = "-z LZW ";
 
         vnonaldr = mgr.own(new mf::Variable("NONA_LDR_REMAPPED_COMP", val, Makefile::NONE));
         vnonaldr->getDef().add();
@@ -279,9 +279,9 @@
         {
             valuestream.str("");
             if (opts.outputImageType == "tif" && opts.outputImageTypeCompression.size() != 0)
-                valuestream << "--compression " << opts.outputImageTypeCompression;
+                valuestream << "--compression=" << opts.outputImageTypeCompression;
             else if (opts.outputImageType == "jpg")
-                valuestream << "--compression " << opts.quality;
+                valuestream << "--compression=" << opts.quality;
 
             venblendldrcomp = mgr.own(new mf::Variable("ENBLEND_LDR_COMP", valuestream.str(), Makefile::NONE));
             venblendldrcomp->getDef().add();
@@ -290,7 +290,7 @@
         {
             makefile::string val;
             if (opts.outputImageTypeHDR == "tif" && opts.outputImageTypeHDRCompression.size() != 0) {
-                val += "--compression " + opts.outputImageTypeHDRCompression;
+                val += "--compression=" + opts.outputImageTypeHDRCompression;
             }
             venblendhdrcomp = mgr.own(new mf::Variable("ENBLEND_HDR_COMP", val, Makefile::NONE));
             venblendhdrcomp->getDef().add();
diff -r 3e7dae57442a -r a195d763c5d0 src/hugin_base/panodata/PanoramaOptions.h
--- a/src/hugin_base/panodata/PanoramaOptions.h	Tue Oct 26 20:39:06 2010 +0200
+++ b/src/hugin_base/panodata/PanoramaOptions.h	Sun Oct 31 12:49:36 2010 -0400
@@ -198,7 +198,7 @@
             m_roi = vigra::Rect2D(m_size);
             outfile = "panorama";
             tiff_saveROI = true;
-            tiffCompression = "NONE";
+            tiffCompression = "LZW";
             quality = 100;
             colorCorrection = NONE;
             colorReferenceImage = 0;
@@ -228,11 +228,11 @@
             outputHDRLayers = false;
             outputHDRStacks = false;
 
-            outputLayersCompression = "PACKBITS";
+            outputLayersCompression = "LZW";
             outputImageType = "tif";
-            outputImageTypeCompression = "NONE";
+            outputImageTypeCompression = "LZW";
             outputImageTypeHDR= "exr";
-            outputImageTypeHDRCompression = "";
+            outputImageTypeHDRCompression = "LZW";
 
             enblendOptions = "";
             enfuseOptions  = "";