[Rawstudio-commit] rawspeed r432 - RawSpeed

[Klaus Post]

Author: post
Date: 2012-07-09 16:35:05 +0200 (Mon, 09 Jul 2012)
New Revision: 432

Modified:
   RawSpeed/LJpegDecompressor.cpp
   RawSpeed/NikonDecompressor.cpp
   RawSpeed/PentaxDecompressor.cpp
Log:
Throw RawDecoderException instead of IOException in decoder for better 
consistency.

Modified: RawSpeed/LJpegDecompressor.cpp
===================================================================
--- RawSpeed/LJpegDecompressor.cpp      2012-07-09 14:27:22 UTC (rev 431)
+++ RawSpeed/LJpegDecompressor.cpp      2012-07-09 14:35:05 UTC (rev 432)
@@ -579,7 +579,7 @@
     */
 
     if (l > frame.prec || htbl->valptr[l] == 0xff) {
-      ThrowIOE("Corrupt JPEG data: bad Huffman code:%u", l);
+      ThrowRDE("Corrupt JPEG data: bad Huffman code:%u", l);
     } else {
       rv = htbl->huffval[htbl->valptr[l] +
                          ((int)(code - htbl->mincode[l]))];
@@ -595,7 +595,7 @@
   // Ensure we have enough bits
   if ((rv + l) > 24) {
     if (rv > 16) // There is no values above 16 bits.
-      ThrowIOE("Corrupt JPEG data: Too many bits requested.");
+      ThrowRDE("Corrupt JPEG data: Too many bits requested.");
     else
       bits->fill();
   }

Modified: RawSpeed/NikonDecompressor.cpp
===================================================================
--- RawSpeed/NikonDecompressor.cpp      2012-07-09 14:27:22 UTC (rev 431)
+++ RawSpeed/NikonDecompressor.cpp      2012-07-09 14:35:05 UTC (rev 432)
@@ -177,7 +177,7 @@
     }
 
     if (l > 16) {
-      ThrowIOE("Corrupt JPEG data: bad Huffman code:%u\n", l);
+      ThrowRDE("Corrupt JPEG data: bad Huffman code:%u\n", l);
     } else {
       rv = dctbl1->huffval[dctbl1->valptr[l] +
                            ((int)(code - dctbl1->mincode[l]))];

Modified: RawSpeed/PentaxDecompressor.cpp
===================================================================
--- RawSpeed/PentaxDecompressor.cpp     2012-07-09 14:27:22 UTC (rev 431)
+++ RawSpeed/PentaxDecompressor.cpp     2012-07-09 14:35:05 UTC (rev 432)
@@ -187,7 +187,7 @@
     */
 
     if (l > 12) {
-      ThrowIOE("Corrupt JPEG data: bad Huffman code:%u\n", l);
+      ThrowRDE("Corrupt JPEG data: bad Huffman code:%u\n", l);
     } else {
       rv = dctbl1->huffval[dctbl1->valptr[l] +
                            ((int)(code - dctbl1->mincode[l]))];


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