diff options
author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-13 18:04:17 +0200 |
---|---|---|
committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-13 18:04:17 +0200 |
commit | f7837e28b5f83d116fa43d0401b7188ce27fc346 (patch) | |
tree | 3de2560e4259f22224f334be17618386860decc7 /src/gui/image | |
parent | 8b0624182bd4998d32c23eded5dbe6dccfd26d5b (diff) | |
parent | 44a58de2aea6d2ac71efe7261a398effbf139f3f (diff) |
Merge branch 'stable' into dev
Conflicts:
src/concurrent/qtconcurrentmedian.h
src/corelib/itemmodels/qabstractitemmodel.cpp
Change-Id: Iac46a90bbb2958cef7670031a4b59c3becd8538a
Diffstat (limited to 'src/gui/image')
-rw-r--r-- | src/gui/image/qjpeghandler.cpp | 29 |
1 files changed, 6 insertions, 23 deletions
diff --git a/src/gui/image/qjpeghandler.cpp b/src/gui/image/qjpeghandler.cpp index 443bb65de3..3f90bb42f0 100644 --- a/src/gui/image/qjpeghandler.cpp +++ b/src/gui/image/qjpeghandler.cpp @@ -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; |