aboutsummaryrefslogtreecommitdiff
path: root/nxcomp/Jpeg.cpp
diff options
context:
space:
mode:
authorGabriel Marcano <gabemarcano@yahoo.com>2015-02-09 15:19:12 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-02-09 15:19:39 +0100
commit78efa8bf9889a006cd5c0a34a22d458de59ee60a (patch)
treea6773fbe43349b8430195c5c7473c5e1cfdc3289 /nxcomp/Jpeg.cpp
parent236ee4ffa8e4fa92bb748301986307841ef060ab (diff)
downloadnx-libs-78efa8bf9889a006cd5c0a34a22d458de59ee60a.tar.gz
nx-libs-78efa8bf9889a006cd5c0a34a22d458de59ee60a.tar.bz2
nx-libs-78efa8bf9889a006cd5c0a34a22d458de59ee60a.zip
Fix FTBFS against libjpeg9a (025_nxcomp-fix-ftbfs-against-jpeg9a.full+lite.patch).
Diffstat (limited to 'nxcomp/Jpeg.cpp')
-rw-r--r--nxcomp/Jpeg.cpp8
1 files changed, 4 insertions, 4 deletions
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)