diff options
| author | Jay Berkenbilt <ejb@ql.org> | 2017-08-22 13:20:55 +0200 |
|---|---|---|
| committer | Jay Berkenbilt <ejb@ql.org> | 2017-08-22 20:13:10 +0200 |
| commit | caf5e39c2e68553101519fb4ce3664a73032d3a3 (patch) | |
| tree | 232245703f0c15b7ca9fc1e1155f0bab1967d9cd /libqpdf/Pl_DCT.cc | |
| parent | 6884ad2eadff6795def2dd336a871227bc8c7d7e (diff) | |
| download | qpdf-caf5e39c2e68553101519fb4ce3664a73032d3a3.tar.zst | |
Fix compiler warnings for clang/mac OS X
Diffstat (limited to 'libqpdf/Pl_DCT.cc')
| -rw-r--r-- | libqpdf/Pl_DCT.cc | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/libqpdf/Pl_DCT.cc b/libqpdf/Pl_DCT.cc index e9ecccd9..68cdc973 100644 --- a/libqpdf/Pl_DCT.cc +++ b/libqpdf/Pl_DCT.cc @@ -4,6 +4,7 @@ #include <setjmp.h> #include <string> #include <stdexcept> +#include <cstdlib> #if BITS_IN_JSAMPLE != 8 # error "qpdf does not support libjpeg built with BITS_IN_JSAMPLE != 8" @@ -112,17 +113,15 @@ Pl_DCT::compress(void* cinfo_p, PointerHolder<Buffer> b) struct jpeg_compress_struct* cinfo = reinterpret_cast<jpeg_compress_struct*>(cinfo_p); -#ifdef __GNUC__ -# if ((__GNUC__ * 100) + __GNUC_MINOR__) >= 406 +#if ((defined(__GNUC__) && ((__GNUC__ * 100) + __GNUC_MINOR__) >= 406) || \ + defined(__clang__)) # pragma GCC diagnostic push # pragma GCC diagnostic ignored "-Wold-style-cast" -# endif #endif jpeg_create_compress(cinfo); -#ifdef __GNUC__ -# if ((__GNUC__ * 100) + __GNUC_MINOR__) >= 406 +#if ((defined(__GNUC__) && ((__GNUC__ * 100) + __GNUC_MINOR__) >= 406) || \ + defined(__clang__)) # pragma GCC diagnostic pop -# endif #endif unsigned char* outbuffer = 0; unsigned long outsize = 0; @@ -171,17 +170,15 @@ Pl_DCT::decompress(void* cinfo_p, PointerHolder<Buffer> b) struct jpeg_decompress_struct* cinfo = reinterpret_cast<jpeg_decompress_struct*>(cinfo_p); -#ifdef __GNUC__ -# if ((__GNUC__ * 100) + __GNUC_MINOR__) >= 406 +#if ((defined(__GNUC__) && ((__GNUC__ * 100) + __GNUC_MINOR__) >= 406) || \ + defined(__clang__)) # pragma GCC diagnostic push # pragma GCC diagnostic ignored "-Wold-style-cast" -# endif #endif jpeg_create_decompress(cinfo); -#ifdef __GNUC__ -# if ((__GNUC__ * 100) + __GNUC_MINOR__) >= 406 +#if ((defined(__GNUC__) && ((__GNUC__ * 100) + __GNUC_MINOR__) >= 406) || \ + defined(__clang__)) # pragma GCC diagnostic pop -# endif #endif jpeg_mem_src(cinfo, b->getBuffer(), b->getSize()); |