[Hugin-cvs] hugin/src/foreign/vigra_impex tiff.cxx,1.4,1.5

[Pablo d'A. <da...@us...>]

Update of /cvsroot/hugin/hugin/src/foreign/vigra_impex
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3955/src/foreign/vigra_impex

Modified Files:
	tiff.cxx 
Log Message:
vigra bugfix: allow to switch back to no TIFF compression after some
compression scheme has been selected.


Index: tiff.cxx
===================================================================
RCS file: /cvsroot/hugin/hugin/src/foreign/vigra_impex/tiff.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- tiff.cxx	15 Aug 2005 21:06:09 -0000	1.4
+++ tiff.cxx	28 Oct 2005 16:54:12 -0000	1.5
@@ -59,11 +59,12 @@
         desc.pixelTypes[7] = "DOUBLE";
 
         // init compression types
-        desc.compressionTypes.resize(4);
-        desc.compressionTypes[0] = "RLE";
-        desc.compressionTypes[1] = "JPEG";
-        desc.compressionTypes[2] = "LZW";
-        desc.compressionTypes[3] = "DEFLATE";
+        desc.compressionTypes.resize(5);
+        desc.compressionTypes[0] = "NONE";
+        desc.compressionTypes[1] = "RLE";
+        desc.compressionTypes[2] = "JPEG";
+        desc.compressionTypes[3] = "LZW";
+        desc.compressionTypes[4] = "DEFLATE";
 
         // init magic strings
         desc.magicStrings.resize(2);
@@ -654,7 +655,9 @@
     {
         // if any compression type is set that we do not support,
         // the expected behavior is to do nothing
-        if ( ( comp == "JPEG" ) && ( quality != -1 ) )
+        if ( comp == "NONE" )
+            tiffcomp = COMPRESSION_NONE;
+        else if ( ( comp == "JPEG" ) && ( quality != -1 ) )
             tiffcomp = COMPRESSION_OJPEG;
         else if ( comp == "RLE" )
             tiffcomp = COMPRESSION_CCITTRLE;