AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compilation fix for libjpeg release 9

Browse Source 
In the latest libjpeg version, the "boolean" type is changed so that
true and false no longer can be used instead of TRUE and FALSE.

Also, purge some ancient code remains meant to support a now defunct
OS´s idea about the boolean type.

Task-number: QTBUG-33166
Change-Id: Iebbdf300cfdc22775954de65f985358424ed2b49
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
This commit is contained in:
aavit 2013-09-10 11:46:51 +02:00 committed by The Qt Project
parent fa7f446f8f
commit fad6aa619b
1 changed files with 6 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/gui/image/qjpeghandler.cpp
View File

@ -160,11 +160,7 @@ static boolean qt_fill_input_buffer(j_decompress_ptr cinfo)
} else {
src->bytes_in_buffer = num_read;
}
#if defined(Q_OS_UNIXWARE)
return B_TRUE;
#else
return true;
#endif
return TRUE;
}
static void qt_skip_input_data(j_decompress_ptr cinfo, long num_bytes)
@ -363,7 +359,7 @@ static bool read_jpeg_image(QImage *outImage,
// If high quality not required, use fast decompression
if( quality < HIGH_QUALITY_THRESHOLD ) {
info->dct_method = JDCT_IFAST;
info->do_fancy_upsampling = false;
info->do_fancy_upsampling = FALSE;
}
(void) jpeg_calc_output_dimensions(info);
@ -496,11 +492,7 @@ static boolean qt_empty_output_buffer(j_compress_ptr cinfo)
dest->next_output_byte = dest->buffer;
dest->free_in_buffer = max_buf;
#if defined(Q_OS_UNIXWARE)
return B_TRUE;
#else
return true;
#endif
return TRUE;
}
static void qt_term_destination(j_compress_ptr cinfo)
@ -625,13 +617,8 @@ static bool write_jpeg_image(const QImage &image, QIODevice *device, volatile in
int quality = sourceQuality >= 0 ? qMin(int(sourceQuality),100) : 75;
#if defined(Q_OS_UNIXWARE)
jpeg_set_quality(&cinfo, quality, B_TRUE /* limit to baseline-JPEG values */);
jpeg_start_compress(&cinfo, B_TRUE);
#else
jpeg_set_quality(&cinfo, quality, true /* limit to baseline-JPEG values */);
jpeg_start_compress(&cinfo, true);
#endif
jpeg_set_quality(&cinfo, quality, TRUE /* limit to baseline-JPEG values */);
jpeg_start_compress(&cinfo, TRUE);
set_text(image, &cinfo, description);
@ -801,11 +788,7 @@ bool QJpegHandlerPrivate::readJpegHeader(QIODevice *device)
if (!setjmp(err.setjmp_buffer)) {
jpeg_save_markers(&info, JPEG_COM, 0xFFFF);
#if defined(Q_OS_UNIXWARE)
(void) jpeg_read_header(&info, B_TRUE);
#else
(void) jpeg_read_header(&info, true);
#endif
(void) jpeg_read_header(&info, TRUE);
int width = 0;
int height = 0;