| Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame^] | 1 | From 14c22398f8370e33a798360ed0dad513af8f1470 Mon Sep 17 00:00:00 2001 |
| 2 | From: AlbrechtS <AlbrechtS@ea41ed52-d2ee-0310-a9c1-e6b18d33e121> |
| 3 | Date: Sun, 15 Mar 2015 19:32:33 +0000 |
| 4 | Subject: [PATCH] Fix 'boolean' issue with jpeg-9 library compatibility (STR |
| 5 | #2920). |
| 6 | |
| 7 | According to comments in STR #2920 and my own tests this is also |
| 8 | compatible with older jpeg libraries (at least jpeg-8). |
| 9 | |
| 10 | Upstream-Status: Backport |
| 11 | |
| 12 | --- |
| 13 | src/Fl_JPEG_Image.cxx | 4 ++-- |
| 14 | 1 file changed, 2 insertions(+), 2 deletions(-) |
| 15 | |
| 16 | diff --git a/src/Fl_JPEG_Image.cxx b/src/Fl_JPEG_Image.cxx |
| 17 | index 47120a7..6cebe88 100644 |
| 18 | --- a/src/Fl_JPEG_Image.cxx |
| 19 | +++ b/src/Fl_JPEG_Image.cxx |
| 20 | @@ -155,7 +155,7 @@ Fl_JPEG_Image::Fl_JPEG_Image(const char *filename) // I - File to load |
| 21 | |
| 22 | jpeg_create_decompress(&dinfo); |
| 23 | jpeg_stdio_src(&dinfo, fp); |
| 24 | - jpeg_read_header(&dinfo, 1); |
| 25 | + jpeg_read_header(&dinfo, TRUE); |
| 26 | |
| 27 | dinfo.quantize_colors = (boolean)FALSE; |
| 28 | dinfo.out_color_space = JCS_RGB; |
| 29 | @@ -337,7 +337,7 @@ Fl_JPEG_Image::Fl_JPEG_Image(const char *name, const unsigned char *data) |
| 30 | |
| 31 | jpeg_create_decompress(&dinfo); |
| 32 | jpeg_mem_src(&dinfo, data); |
| 33 | - jpeg_read_header(&dinfo, 1); |
| 34 | + jpeg_read_header(&dinfo, TRUE); |
| 35 | |
| 36 | dinfo.quantize_colors = (boolean)FALSE; |
| 37 | dinfo.out_color_space = JCS_RGB; |
| 38 | -- |
| 39 | 1.7.9.5 |
| 40 | |