octoleo/qpdf
2
1
Fork 0
mirror of https://github.com/qpdf/qpdf.git synced 2024-12-31 14:01:59 +00:00
Code Issues Releases Wiki Activity

Fix compiler warnings for clang/mac OS X

Browse Source
This commit is contained in:
Jay Berkenbilt 2017-08-22 07:20:55 -04:00
parent 6884ad2ead
commit caf5e39c2e
5 changed files with 31 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libqpdf/Pl_DCT.cc
View File

@ -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());

10
libqpdf/Pl_Flate.cc
View File

@ -76,11 +76,10 @@ Pl_Flate::handleData(unsigned char* data, int len, int flush)
// deflateInit and inflateInit are macros that use old-style
// casts.
#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
if (this->action == a_deflate)
{
@ -90,10 +89,9 @@ Pl_Flate::handleData(unsigned char* data, int len, int flush)
{
err = inflateInit(&zstream);
}
#ifdef __GNUC__
# if ((__GNUC__ * 100) + __GNUC_MINOR__) >= 406
#if ((defined(__GNUC__) && ((__GNUC__ * 100) + __GNUC_MINOR__) >= 406) || \
defined(__clang__))
# pragma GCC diagnostic pop
# endif
#endif
checkError("Init", err);

10
libqpdf/SecureRandomDataProvider.cc
View File

@ -48,18 +48,16 @@ class WindowsCryptProvider
PROV_RSA_FULL,
0))
{
#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"
# pragma GCC diagnostic ignored "-Wsign-compare"
# endif
#endif
if (GetLastError() == NTE_BAD_KEYSET)
#ifdef __GNUC__
# if ((__GNUC__ * 100) + __GNUC_MINOR__) >= 406
#if ((defined(__GNUC__) && ((__GNUC__ * 100) + __GNUC_MINOR__) >= 406) || \
defined(__clang__))
# pragma GCC diagnostic pop
# endif
#endif
{
if (! CryptAcquireContext(&crypt_prov,

9
libqpdf/sph/sph_types.h
View File

@ -804,6 +804,11 @@ static inline void sph_enc64be_aligned(void *dst, sph_u64 val);
/* ============== END documentation block for Doxygen ============= */
#if defined(__clang__)
# pragma GCC diagnostic push
# pragma GCC diagnostic ignored "-Wold-style-cast"
#endif
#ifndef DOXYGEN_IGNORE
/*
@ -1971,6 +1976,10 @@ sph_dec64le_aligned(const void *src)
#endif
#if defined(__clang__)
# pragma GCC diagnostic pop
#endif
#endif /* Doxygen excluded block */
#endif

6
libtests/dct_compress.cc
View File

@ -17,11 +17,15 @@ static void usage()
class Callback: public Pl_DCT::CompressConfig
{
public:
Callback() :
called(false)
{
}
virtual ~Callback()
{
}
virtual void apply(jpeg_compress_struct*);
bool called = false;
bool called;
};
void Callback::apply(jpeg_compress_struct*)