CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

fltk: fix build issue.

Browse Source 
this patch fixes:
Fl_JPEG_Image.cxx: In constructor 'Fl_JPEG_Image::Fl_JPEG_Image(const char*)':
| Fl_JPEG_Image.cxx:156:29: error: invalid conversion from 'int' to 'boolean' [-fpermissive]

Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
Armin Kuster 2016-01-01 11:41:41 -08:00 committed by Martin Jansa
parent 428082d322
commit 3c1ad2dcf9
2 changed files with 38 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
meta-oe/recipes-support/fltk/fltk-1.1.10/Fl_JPEG_Image_buildix.patch Normal file
View File

@ -0,0 +1,37 @@
fltk: Fl_JPEG_Image.cxx bug in fltk-1.3.x for jpeg-9
Link: http://www.fltk.org/str.php?L2920
Version: 1.3-current
There has been a change in jpeg-9:
Fl_JPEG_Image.cxx: In constructor 'Fl_JPEG_Image::Fl_JPEG_Image(const
char*)':
Fl_JPEG_Image.cxx:158:29: error: invalid conversion from 'int' to
'boolean' [-fpermissive]
In file included from Fl_JPEG_Image.cxx:50:0:
/usr/include/jpeglib.h:1032:13: error: initializing argument 2 of 'int
jpeg_read_header(j_decompress_ptr, boolean)' [-fpermissive]
http://permalink.gmane.org/gmane.comp.lib.fltk.bugs/10893
Upstream-Status: Backport
partical back port as this version is only affected by on change.
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Index: fltk-1.1.10/src/Fl_JPEG_Image.cxx
===================================================================
--- fltk-1.1.10.orig/src/Fl_JPEG_Image.cxx
+++ fltk-1.1.10/src/Fl_JPEG_Image.cxx
@@ -153,7 +153,7 @@ Fl_JPEG_Image::Fl_JPEG_Image(const char
jpeg_create_decompress(&dinfo);
jpeg_stdio_src(&dinfo, fp);
- jpeg_read_header(&dinfo, 1);
+ jpeg_read_header(&dinfo, TRUE);
dinfo.quantize_colors = (boolean)FALSE;
dinfo.out_color_space = JCS_RGB;

1
meta-oe/recipes-support/fltk/fltk_1.1.10.bb
View File

@ -13,6 +13,7 @@ SRC_URI = "ftp://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/fltk/${PV}/fl
file://dso-fix.patch \
file://libpng15.patch \
file://fltk-no-freetype-config.patch \
file://Fl_JPEG_Image_buildix.patch \
"
S = "${WORKDIR}/fltk-${PV}"