summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorEven Rouault <even.rouault@spatialys.com>2017-08-17 19:05:29 +0200
committerEven Rouault <even.rouault@spatialys.com>2017-08-17 19:05:29 +0200
commit17ea17f487a777d14bd322ac06c4e6cb9124a226 (patch)
tree3129ed0cc7b32b3bdb5336cbd5bd06ddfc8e7580 /src
parentfd8448ed446a935da3210821a783e794ede3c599 (diff)
Fix -Wconversion warning
Diffstat (limited to 'src')
-rw-r--r--src/bin/jp2/convert.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bin/jp2/convert.c b/src/bin/jp2/convert.c
index deb4641e..5459f7d4 100644
--- a/src/bin/jp2/convert.c
+++ b/src/bin/jp2/convert.c
@@ -583,7 +583,7 @@ struct tga_header {
/* Returns a ushort from a little-endian serialized value */
static unsigned short get_tga_ushort(const unsigned char *data)
{
- return (unsigned short)data[0] | (unsigned short)(data[1] << 8);
+ return (unsigned short)(data[0] | (data[1] << 8));
}
#define TGA_HEADER_SIZE 18