aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/patches/025_nxcomp-fix-ftbfs-against-jpeg9a.full+lite.patch40
-rw-r--r--debian/patches/series1
-rw-r--r--nxcomp/Jpeg.cpp8
3 files changed, 4 insertions, 45 deletions
diff --git a/debian/patches/025_nxcomp-fix-ftbfs-against-jpeg9a.full+lite.patch b/debian/patches/025_nxcomp-fix-ftbfs-against-jpeg9a.full+lite.patch
deleted file mode 100644
index 66ca8c33e..000000000
--- a/debian/patches/025_nxcomp-fix-ftbfs-against-jpeg9a.full+lite.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Description: Fix FTBFS when built against libjpeg9a
-Author: Gabriel Marcano <gabemarcano@yahoo.com>
---- a/nxcomp/Jpeg.cpp 2014-08-19 22:23:36.139072400 -0400
-+++ b/nxcomp/Jpeg.cpp 2014-08-19 22:25:24.323182800 -0400
-@@ -440,7 +440,7 @@
-
- JpegSetSrcManager(&cinfo, compressedData, compressedLen);
-
-- jpeg_read_header(&cinfo, 1);
-+ jpeg_read_header(&cinfo, TRUE);
-
- if (jpegError) goto AbortDecompressJpeg16;
-
-@@ -581,7 +581,7 @@
-
- JpegSetSrcManager(&cinfo, compressedData, compressedLen);
-
-- jpeg_read_header(&cinfo, 1);
-+ jpeg_read_header(&cinfo, TRUE);
-
- if (jpegError) goto AbortDecompressJpeg24;
-
-@@ -718,7 +718,7 @@
-
- JpegSetSrcManager(&cinfo, compressedData, compressedLen);
-
-- jpeg_read_header(&cinfo, 1);
-+ jpeg_read_header(&cinfo, TRUE);
-
- if (jpegError) goto AbortDecompressJpeg32;
-
-@@ -833,7 +833,7 @@
- jpegSrcManager.bytes_in_buffer = jpegBufferLen;
- jpegSrcManager.next_input_byte = (JOCTET *)jpegBufferPtr;
-
-- return 1;
-+ return TRUE;
- }
-
- static void JpegSkipInputData(j_decompress_ptr cinfo, long num_bytes)
diff --git a/debian/patches/series b/debian/patches/series
index 63bc3dc43..6eadd7bd9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-025_nxcomp-fix-ftbfs-against-jpeg9a.full+lite.patch
026_nxcompext_honour-optflags.full.patch
026_nxcomp_honour-optflags.full+lite.patch
026_nxcompshad_honour-optflags.full.patch
diff --git a/nxcomp/Jpeg.cpp b/nxcomp/Jpeg.cpp
index b3973227c..9f71cbadf 100644
--- a/nxcomp/Jpeg.cpp
+++ b/nxcomp/Jpeg.cpp
@@ -440,7 +440,7 @@ int DecompressJpeg16(unsigned char *compressedData, int compressedLen,
JpegSetSrcManager(&cinfo, compressedData, compressedLen);
- jpeg_read_header(&cinfo, 1);
+ jpeg_read_header(&cinfo, TRUE);
if (jpegError) goto AbortDecompressJpeg16;
@@ -581,7 +581,7 @@ int DecompressJpeg24(unsigned char *compressedData, int compressedLen,
JpegSetSrcManager(&cinfo, compressedData, compressedLen);
- jpeg_read_header(&cinfo, 1);
+ jpeg_read_header(&cinfo, TRUE);
if (jpegError) goto AbortDecompressJpeg24;
@@ -718,7 +718,7 @@ int DecompressJpeg32(unsigned char *compressedData, int compressedLen,
JpegSetSrcManager(&cinfo, compressedData, compressedLen);
- jpeg_read_header(&cinfo, 1);
+ jpeg_read_header(&cinfo, TRUE);
if (jpegError) goto AbortDecompressJpeg32;
@@ -833,7 +833,7 @@ static boolean JpegFillInputBuffer(j_decompress_ptr cinfo)
jpegSrcManager.bytes_in_buffer = jpegBufferLen;
jpegSrcManager.next_input_byte = (JOCTET *)jpegBufferPtr;
- return 1;
+ return TRUE;
}
static void JpegSkipInputData(j_decompress_ptr cinfo, long num_bytes)