Author: post
Date: 2010-04-25 14:36:06 +0200 (Sun, 25 Apr 2010)
New Revision: 226
Modified:
RawSpeed/NefDecoder.cpp
Log:
NEF Decoder: Also catch RawDecoderException, and continue if not in first
slice. Re-throw IOExceptions as RawDecoderExceptions.
Modified: RawSpeed/NefDecoder.cpp
===================================================================
--- RawSpeed/NefDecoder.cpp 2010-04-25 12:22:47 UTC (rev 225)
+++ RawSpeed/NefDecoder.cpp 2010-04-25 12:36:06 UTC (rev 226)
@@ -179,11 +179,16 @@
iPoint2D pos(0, offY);
try {
readUncompressedRaw(in, size, pos, width*bitPerPixel / 8, bitPerPixel,
true);
+ } catch (RawDecoderException e) {
+ if (i>0)
+ errors.push_back(_strdup(e.what()));
+ else
+ throw;
} catch (IOException e) {
if (i>0)
errors.push_back(_strdup(e.what()));
else
- throw;
+ ThrowRDE("NEF decoder: IO error occurred in first slice, unable to
decode more. Error is: %s", e.what());
}
offY += slice.h;
}
_______________________________________________
Rawstudio-commit mailing list
[email protected]
http://rawstudio.org/cgi-bin/mailman/listinfo/rawstudio-commit
