From 138a65d6c143427755d49ec32fe43f17a3e6c8b6 Mon Sep 17 00:00:00 2001 From: Mathieu Malaterre Date: Fri, 14 Mar 2014 12:02:05 +0000 Subject: [trunk] Move INLINE definition within openjpeg.h header since application may use it --- src/bin/jp2/convert.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'src/bin') diff --git a/src/bin/jp2/convert.c b/src/bin/jp2/convert.c index 90684a2c..5dd09da7 100644 --- a/src/bin/jp2/convert.c +++ b/src/bin/jp2/convert.c @@ -183,7 +183,7 @@ static int tga_readheader(FILE *fp, unsigned int *bits_per_pixel, #if WORDS_BIGENDIAN == 1 -static inline int16_t swap16(int16_t x) +static INLINE int16_t swap16(int16_t x) { return((((u_int16_t)x & 0x00ffU) << 8) | (((u_int16_t)x & 0xff00U) >> 8)); @@ -1421,13 +1421,7 @@ opj_image_t* pgxtoimage(const char *filename, opj_cparameters_t *parameters) { #define CLAMP(x,a,b) x < a ? a : (x > b ? b : x) -#ifdef _MSC_VER -#define STIN static __inline -#else -#define STIN static inline -#endif - -STIN int clamp( const int value, const int prec, const int sgnd ) +static INLINE int clamp( const int value, const int prec, const int sgnd ) { if( sgnd ) { -- cgit v1.2.3