Fix warnings about unused variables when building with GCC 4.8.x
git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/trunk@1241 632fc199-4ca6-4c93-a231-07263d6284db
diff --git a/turbojpeg.c b/turbojpeg.c
index 5aee2e8..c824132 100644
--- a/turbojpeg.c
+++ b/turbojpeg.c
@@ -122,6 +122,16 @@
if(!this) {snprintf(errStr, JMSG_LENGTH_MAX, "Invalid handle"); \
return -1;} \
cinfo=&this->cinfo; dinfo=&this->dinfo;
+#define getcinstance(handle) tjinstance *this=(tjinstance *)handle; \
+ j_compress_ptr cinfo=NULL; \
+ if(!this) {snprintf(errStr, JMSG_LENGTH_MAX, "Invalid handle"); \
+ return -1;} \
+ cinfo=&this->cinfo;
+#define getdinstance(handle) tjinstance *this=(tjinstance *)handle; \
+ j_decompress_ptr dinfo=NULL; \
+ if(!this) {snprintf(errStr, JMSG_LENGTH_MAX, "Invalid handle"); \
+ return -1;} \
+ dinfo=&this->dinfo;
static int getPixelFormat(int pixelSize, int flags)
{
@@ -605,7 +615,7 @@
unsigned char *rgbBuf=NULL;
#endif
- getinstance(handle)
+ getcinstance(handle)
if((this->init&COMPRESS)==0)
_throw("tjCompress2(): Instance has not been initialized for compression");
@@ -710,7 +720,7 @@
unsigned char *rgbBuf=NULL;
#endif
- getinstance(handle);
+ getcinstance(handle);
for(i=0; i<MAX_COMPONENTS; i++)
{
@@ -881,7 +891,7 @@
tmpbufsize=0, usetmpbuf=0, th[MAX_COMPONENTS];
JSAMPLE *_tmpbuf=NULL, *ptr=srcBuf; JSAMPROW *tmpbuf[MAX_COMPONENTS];
- getinstance(handle)
+ getcinstance(handle)
for(i=0; i<MAX_COMPONENTS; i++)
{
@@ -1045,7 +1055,7 @@
{
int retval=0;
- getinstance(handle);
+ getdinstance(handle);
if((this->init&DECOMPRESS)==0)
_throw("tjDecompressHeader3(): Instance has not been initialized for decompression");
@@ -1131,7 +1141,7 @@
unsigned char *_dstBuf=NULL; int _pitch=0;
#endif
- getinstance(handle);
+ getdinstance(handle);
if((this->init&DECOMPRESS)==0)
_throw("tjDecompress2(): Instance has not been initialized for decompression");
@@ -1303,7 +1313,7 @@
JMETHOD(int, old_read_markers, (j_decompress_ptr));
JMETHOD(void, old_reset_marker_reader, (j_decompress_ptr));
- getinstance(handle);
+ getdinstance(handle);
for(i=0; i<MAX_COMPONENTS; i++)
{
@@ -1452,7 +1462,7 @@
JSAMPLE *_tmpbuf=NULL, *ptr=dstBuf; JSAMPROW *tmpbuf[MAX_COMPONENTS];
int dctsize;
- getinstance(handle);
+ getdinstance(handle);
for(i=0; i<MAX_COMPONENTS; i++)
{