diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2016-09-08 10:30:09 +0200 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2016-09-08 10:30:09 +0200 |
| commit | 48c16b2c199210a3c20b306a737eac5fc2c8f6c9 (patch) | |
| tree | 35cefb1c82b55cc19cfac9ef04db410565338b5a /src/bin | |
| parent | ab22c5bad55fccdc440847c896baaf4bf89365a0 (diff) | |
| parent | ef01f18dfc6780b776d0674ed3e7415c6ef54d24 (diff) | |
Merge branch 'master' of https://github.com/uclouvain/openjpeg into tier1_optimizations_multithreading_2
Conflicts:
src/lib/openjp2/t1.c
Diffstat (limited to 'src/bin')
| -rw-r--r-- | src/bin/jpwl/convert.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/bin/jpwl/convert.c b/src/bin/jpwl/convert.c index bf7b5641..9db7e955 100644 --- a/src/bin/jpwl/convert.c +++ b/src/bin/jpwl/convert.c @@ -187,10 +187,9 @@ static int tga_readheader(FILE *fp, unsigned int *bits_per_pixel, #ifdef OPJ_BIG_ENDIAN -static inline int16_t swap16(int16_t x) +static inline uint16_t swap16(uint16_t x) { - return((((u_int16_t)x & 0x00ffU) << 8) | - (((u_int16_t)x & 0xff00U) >> 8)); + return(((x & 0x00ffU) << 8) | ((x & 0xff00U) >> 8)); } #endif |