aboutsummaryrefslogtreecommitdiff
path: root/debian/patches/0025_nxcomp-fix-ftbfs-against-jpeg9a.full+lite.patch
blob: ca556b19351c09eeda41f629c4e754edbc9866ff (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
Description: Fix FTBFS when built against libjpeg9a
Author: Gabriel Marcano <gabemarcano@yahoo.com>
--- a/nxcomp/Jpeg.cpp
+++ b/nxcomp/Jpeg.cpp
@@ -440,7 +440,7 @@ int DecompressJpeg16(unsigned char *comp
 
   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 *comp
 
   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 *comp
 
   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_dec
   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)