diff options
author | Thiago Macieira <thiago.macieira@intel.com> | 2011-08-19 11:40:38 (GMT) |
---|---|---|
committer | Joerg Bornemann <joerg.bornemann@nokia.com> | 2011-08-19 12:08:17 (GMT) |
commit | 564e6c02107a8b0db9a818c0a66affe94694ab39 (patch) | |
tree | 34b229f5604bcf6cdc38dd949bfa0c4cf7df6b33 /src/gui/image | |
parent | 0cb57328453c476b01b058d57211afee197d6a82 (diff) | |
download | Qt-564e6c02107a8b0db9a818c0a66affe94694ab39.zip Qt-564e6c02107a8b0db9a818c0a66affe94694ab39.tar.gz Qt-564e6c02107a8b0db9a818c0a66affe94694ab39.tar.bz2 |
Fix compilation of qjpeg on MinGW with GCC 4.6
Diffstat (limited to 'src/gui/image')
-rw-r--r-- | src/gui/image/qjpeghandler.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/gui/image/qjpeghandler.cpp b/src/gui/image/qjpeghandler.cpp index 673a6d6..8fea456 100644 --- a/src/gui/image/qjpeghandler.cpp +++ b/src/gui/image/qjpeghandler.cpp @@ -74,6 +74,11 @@ extern "C" { #endif } +#if defined(JPEG_TRUE) && !defined(HAVE_BOOLEAN) +// this jpeglib.h uses JPEG_boolean +typedef JPEG_boolean boolean; +#endif + QT_BEGIN_NAMESPACE void QT_FASTCALL convert_rgb888_to_rgb32_C(quint32 *dst, const uchar *src, int len) |