From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 17 Aug 2017 17:05:29 +0000 (+0200)
Subject: Fix -Wconversion warning
X-Git-Tag: v2.3.0~66
X-Git-Url: https://main.carlh.net/gitweb/?a=commitdiff_plain;h=17ea17f487a777d14bd322ac06c4e6cb9124a226;p=openjpeg.git

Fix -Wconversion warning
---

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