Merge branch '3.6.x'

1 files changed, 0 insertions, 40 deletions

diff --git a/debian/patches/0025_nxcomp-fix-ftbfs-against-jpeg9a.full+lite.patch b/debian/patches/0025_nxcomp-fix-ftbfs-against-jpeg9a.full+lite.patch
deleted file mode 100644
index ca556b193..000000000
--- a/debian/patches/0025_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
-+++ 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)