[libkdcraw/f17] fix build
Kevin Kofler
kkofler at fedoraproject.org
Sat Mar 9 23:24:13 UTC 2013
commit 5f0ddd50b8f0ee56accfcc158820bb28796ef6e1
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date: Sun Mar 10 00:23:36 2013 +0100
fix build
<stdexcept> is only used on WIN32, so don't use std::exception, use instead
one of the predefined (integer) exceptions.
libkdcraw-4.10.0-libjpeg-turbo.patch | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/libkdcraw-4.10.0-libjpeg-turbo.patch b/libkdcraw-4.10.0-libjpeg-turbo.patch
index 27ef5a3..7cd2777 100644
--- a/libkdcraw-4.10.0-libjpeg-turbo.patch
+++ b/libkdcraw-4.10.0-libjpeg-turbo.patch
@@ -75,7 +75,7 @@ diff -Nur libkdcraw-4.10.0/libraw/RawSpeed/rawspeed.jpeg-version.patch libkdcraw
+ static void init_source (j_decompress_ptr cinfo) {}
diff -Nur libkdcraw-4.10.0/libraw/src/libraw_datastream.cpp libkdcraw-4.10.0-libjpeg-turbo/libraw/src/libraw_datastream.cpp
--- libkdcraw-4.10.0/libraw/src/libraw_datastream.cpp 2013-01-23 23:00:44.000000000 +0100
-+++ libkdcraw-4.10.0-libjpeg-turbo/libraw/src/libraw_datastream.cpp 2013-03-10 00:04:54.000000000 +0100
++++ libkdcraw-4.10.0-libjpeg-turbo/libraw/src/libraw_datastream.cpp 2013-03-10 00:22:15.000000000 +0100
@@ -443,9 +443,52 @@
#endif
}
@@ -95,7 +95,7 @@ diff -Nur libkdcraw-4.10.0/libraw/src/libraw_datastream.cpp libkdcraw-4.10.0-lib
+ struct jpeg_source_mgr* src = (struct jpeg_source_mgr*) cinfo->src;
+
+ if (num_bytes > (int)src->bytes_in_buffer)
-+ throw std::runtime_error("JPEG Decoder - read out of buffer");
++ throw LIBRAW_EXCEPTION_IO_EOF;
+ if (num_bytes > 0) {
+ src->next_input_byte += (size_t) num_bytes;
+ src->bytes_in_buffer -= (size_t) num_bytes;
More information about the scm-commits
mailing list