[Rawstudio-commit] rawspeed r595 - RawSpeed

[Klaus Post]

Author: post
Date: 2013-09-29 18:32:16 +0200 (Sun, 29 Sep 2013)
New Revision: 595

Modified:
   RawSpeed/Cr2Decoder.cpp
   RawSpeed/LJpegPlain.cpp
Log:
When only one slice, set it to width of image (Fixes Canon G16)

Modified: RawSpeed/Cr2Decoder.cpp
===================================================================
--- RawSpeed/Cr2Decoder.cpp     2013-09-25 15:43:22 UTC (rev 594)
+++ RawSpeed/Cr2Decoder.cpp     2013-09-29 16:32:16 UTC (rev 595)
@@ -28,7 +28,7 @@
 
 Cr2Decoder::Cr2Decoder(TiffIFD *rootIFD, FileMap* file) :
     RawDecoder(file), mRootIFD(rootIFD) {
-  decoderVersion = 3;
+  decoderVersion = 4;
 }
 
 Cr2Decoder::~Cr2Decoder(void) {

Modified: RawSpeed/LJpegPlain.cpp
===================================================================
--- RawSpeed/LJpegPlain.cpp     2013-09-25 15:43:22 UTC (rev 594)
+++ RawSpeed/LJpegPlain.cpp     2013-09-29 16:32:16 UTC (rev 595)
@@ -62,7 +62,11 @@
     frame.h = w;
   }
 
-  if (slicesW.empty())
+  /* Correct wrong slice count (Canon G16) */
+  if (slicesW.size() == 1)
+    slicesW[0] = frame.w * frame.cps;
+
+ if (slicesW.empty())
     slicesW.push_back(frame.w*frame.cps);
 
   if ( 0 == frame.h || 0 == frame.w)


_______________________________________________
Rawstudio-commit mailing list
Rawstudio-commit@rawstudio.org
http://rawstudio.org/cgi-bin/mailman/listinfo/rawstudio-commit