As of JPEG-9, the type 'boolean' is an enumeration, but since glib defines TRUE and FALSE as numeric constants and this is C++, they need to be explicitly casted. --- a/src/af/util/xp/ut_jpeg.cpp +++ b/src/af/util/xp/ut_jpeg.cpp @@ -102,7 +102,7 @@ static boolean _jpegFillInputBuffer (j_decompress_ptr cinfo) src->pub.next_input_byte = src->sourceBuf->getPointer (src->pos); src->pub.bytes_in_buffer = src->sourceBuf->getLength (); - return 1; // boolean is a libjpeg type that is an int. + return (boolean)TRUE; } /* In the following file, we also need to reverse header include order: JPEG needs to be included before Glib, which is included by "abiword-garble.h" for this fix to work. The JPEG header needs the types FILE and size_t, we can get them from cstdio. --- a/plugins/garble/xp/abiword-garble-jpeg.cpp 2009-09-05 17:49:53.000000000 +0200 +++ b/plugins/garble/xp/abiword-garble-jpeg.cpp 2014-09-07 21:28:49.364008571 +0200 @@ -20,12 +20,14 @@ * 02111-1307, USA. */ -#include "abiword-garble.h" +#include extern "C" { #include } +#include "abiword-garble.h" + //----------------------------------------------------------------------------- typedef struct { struct jpeg_destination_mgr pub; @@ -49,7 +51,7 @@ mem_dest_ptr dest = (mem_dest_ptr) cinfo->dest; dest->pub.next_output_byte = dest->buf; dest->pub.free_in_buffer = dest->bufsize; - return FALSE; + return (boolean)FALSE; } //----------------------------------------------------------------------------- @@ -96,7 +98,7 @@ cinfo.image_width = (JDIMENSION) w; cinfo.image_height = (JDIMENSION) h; jpeg_set_defaults (&cinfo); - jpeg_set_quality ( &cinfo, 50, TRUE ); + jpeg_set_quality ( &cinfo, 50, (boolean)TRUE ); cinfo.dest = (struct jpeg_destination_mgr *) (*cinfo.mem->alloc_small)((j_common_ptr)&cinfo, JPOOL_PERMANENT, sizeof(mem_destination_mgr)); dest = (mem_dest_ptr) cinfo.dest; dest->pub.init_destination = _jpeg_init_destination; @@ -105,7 +107,7 @@ dest->buf = (JOCTET*)data; dest->bufsize = length; dest->jpegsize = 0; - jpeg_start_compress (&cinfo, TRUE); + jpeg_start_compress (&cinfo, (boolean)TRUE); // write data for (int i=0; ijemalloc.scm
AgeCommit message (Expand)Author
2017-12-10gnu: jemalloc: Fix tests for aarch64....Eric Bavier
2017-12-11gnu: rust: Update rust to 1.22.1 and cargo to 1.23.0....Nikolai Merinov
2017-08-28gnu: jemalloc: Update to 5.0.1....Efraim Flashner
2017-04-30gnu: jemalloc: Disable transparent huge pages on non-Intel systems....Efraim Flashner
2017-03-01gnu: jemalloc: Update to 4.5.0....Marius Bakke
2017-02-19gnu: jemalloc: Update to 4.4.0....Marius Bakke
2016-05-19gnu: jemalloc: Update to 4.2.0....Jelle Licht
2016-05-13gnu: jemalloc: No longer build with gcc-4.8 on i686....Mark H Weaver
2016-05-04gnu: jemalloc: Update to 4.1.0....Jelle Licht
2015-06-21gnu: jemalloc: Build with gcc-4.8 on i686....Mark H Weaver
2015-04-18gnu: Add jemalloc....宋文武