diff --git a/rtengine/dcraw.cc b/rtengine/dcraw.cc index 36bbc9d56..74389585e 100644 --- a/rtengine/dcraw.cc +++ b/rtengine/dcraw.cc @@ -259,7 +259,7 @@ void CLASS derror() fprintf (stderr,_("Corrupt data near 0x%llx\n"), (INT64) ftello(ifp)); } data_error++; -/*RT*/ longjmp (failure, 1); +/*RT Issue 2467 longjmp (failure, 1);*/ } ushort CLASS sget2 (uchar *s) diff --git a/rtengine/dcraw.patch b/rtengine/dcraw.patch index 234b0b766..30ab57e81 100755 --- a/rtengine/dcraw.patch +++ b/rtengine/dcraw.patch @@ -1,5 +1,5 @@ ---- dcraw.c 2014-07-24 16:15:36.700261700 +0200 -+++ dcraw.cc 2014-08-19 16:28:10.968569879 +0200 +--- dcraw.c 2014-09-10 12:00:54 +0000 ++++ dcraw.cc 2014-09-10 12:27:02 +0000 @@ -1,3 +1,15 @@ +/*RT*/#include +/*RT*/#include @@ -169,7 +169,7 @@ fprintf (stderr,_("Corrupt data near 0x%llx\n"), (INT64) ftello(ifp)); } data_error++; -+/*RT*/ longjmp (failure, 1); ++/*RT Issue 2467 longjmp (failure, 1);*/ } ushort CLASS sget2 (uchar *s) diff --git a/rtengine/rawimage.cc b/rtengine/rawimage.cc index c61d5f556..02848c9f9 100755 --- a/rtengine/rawimage.cc +++ b/rtengine/rawimage.cc @@ -350,14 +350,14 @@ int RawImage::loadRaw (bool loadData, bool closeFile, ProgressListener *plistene meta_data = (char *) (image + height*width); if(!image) return 200; - +/* Issue 2467 if (setjmp (failure)) { if (image) { free (image); image=NULL; } if (raw_image) { free(raw_image); raw_image=NULL; } fclose(ifp); ifp=NULL; return 100; } - +*/ // Load raw pixels data fseek (ifp, data_offset, SEEK_SET); (this->*load_raw)();