Eliminate compiler warnings w/ Solaris Studio
diff --git a/jcarith.c b/jcarith.c
index a16f45d..c55c0ea 100644
--- a/jcarith.c
+++ b/jcarith.c
@@ -4,7 +4,7 @@
* This file was part of the Independent JPEG Group's software:
* Developed 1997-2009 by Guido Vollbeding.
* libjpeg-turbo Modifications:
- * Copyright (C) 2015, D. R. Commander.
+ * Copyright (C) 2015, 2018, D. R. Commander.
* For conditions of distribution and use, see the accompanying README.ijg
* file.
*
@@ -142,13 +142,13 @@
/* Find the e->c in the coding interval with the largest
* number of trailing zero bits */
- if ((temp = (e->a - 1 + e->c) & 0xFFFF0000L) < e->c)
+ if ((temp = (e->a - 1 + e->c) & 0xFFFF0000UL) < e->c)
e->c = temp + 0x8000L;
else
e->c = temp;
/* Send remaining bytes to output */
e->c <<= e->ct;
- if (e->c & 0xF8000000L) {
+ if (e->c & 0xF8000000UL) {
/* One final overflow has to be handled */
if (e->buffer >= 0) {
if (e->zc)
diff --git a/simd/i386/jsimd.c b/simd/i386/jsimd.c
index 9434bb0..0b5a410 100644
--- a/simd/i386/jsimd.c
+++ b/simd/i386/jsimd.c
@@ -32,7 +32,7 @@
#define IS_ALIGNED_SSE(ptr) (IS_ALIGNED(ptr, 4)) /* 16 byte alignment */
#define IS_ALIGNED_AVX(ptr) (IS_ALIGNED(ptr, 5)) /* 32 byte alignment */
-static unsigned int simd_support = ~0;
+static unsigned int simd_support = (unsigned int)(~0);
static unsigned int simd_huffman = 1;
/*
diff --git a/simd/x86_64/jsimd.c b/simd/x86_64/jsimd.c
index 6ec5f64..7927875 100644
--- a/simd/x86_64/jsimd.c
+++ b/simd/x86_64/jsimd.c
@@ -32,7 +32,7 @@
#define IS_ALIGNED_SSE(ptr) (IS_ALIGNED(ptr, 4)) /* 16 byte alignment */
#define IS_ALIGNED_AVX(ptr) (IS_ALIGNED(ptr, 5)) /* 32 byte alignment */
-static unsigned int simd_support = ~0;
+static unsigned int simd_support = (unsigned int)(~0);
static unsigned int simd_huffman = 1;
/*
diff --git a/tjunittest.c b/tjunittest.c
index ed4bc6b..26a16bc 100644
--- a/tjunittest.c
+++ b/tjunittest.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C)2009-2014, 2017 D. R. Commander. All Rights Reserved.
+ * Copyright (C)2009-2014, 2017-2018 D. R. Commander. All Rights Reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
@@ -61,14 +61,14 @@
#define _throwtj() { \
printf("TurboJPEG ERROR:\n%s\n", tjGetErrorStr()); \
- bailout(); \
+ bailout() \
}
#define _tj(f) { if ((f) == -1) _throwtj(); }
-#define _throw(m) { printf("ERROR: %s\n", m); bailout(); }
+#define _throw(m) { printf("ERROR: %s\n", m); bailout() }
#define _throwmd5(filename, md5sum, ref) { \
printf("\n%s has an MD5 sum of %s.\n Should be %s.\n", filename, md5sum, \
ref); \
- bailout(); \
+ bailout() \
}
const char *subNameLong[TJ_NUMSAMP] = {
@@ -348,7 +348,7 @@
if (!file || fwrite(jpegBuf, jpegSize, 1, file) != 1) {
printf("ERROR: Could not write to %s.\n%s\n", filename, strerror(errno));
- bailout();
+ bailout()
}
bailout:
diff --git a/turbojpeg.c b/turbojpeg.c
index 472cd9d..2ecd9e7 100644
--- a/turbojpeg.c
+++ b/turbojpeg.c
@@ -168,7 +168,7 @@
}
#define _throw(m) { \
snprintf(this->errStr, JMSG_LENGTH_MAX, "%s", m); \
- this->isInstanceError = TRUE; _throwg(m); \
+ this->isInstanceError = TRUE; _throwg(m) \
}
#define getinstance(handle) \
