X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2Fgdcmopenjpeg%2Flibopenjpeg%2Fj2k.h;h=b42ecf800f44a1109391708a99353cc634e25108;hb=4c0fe0142482ede7dd8f5408f9303d78c213435b;hp=580eff940c0dea253d52f55756ca3d36237b44bb;hpb=e8e78ebfc4f1c5f51a06d1092abe572c955bfdd8;p=gdcm.git diff --git a/src/gdcmopenjpeg/libopenjpeg/j2k.h b/src/gdcmopenjpeg/libopenjpeg/j2k.h index 580eff94..b42ecf80 100644 --- a/src/gdcmopenjpeg/libopenjpeg/j2k.h +++ b/src/gdcmopenjpeg/libopenjpeg/j2k.h @@ -26,24 +26,23 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#define VERSION "0.0.8" +#define VERSION "0.0.9" -#if defined(_WIN32) && defined (OPENJPEGDLL) && !defined(OPENJPEGSTATIC) +#if defined(_WIN32) && defined (OPENJPEGDLL) #ifdef gdcmopenjpeg_EXPORTS /*LIBJ2K_EXPORTS*/ #define LIBJ2K_API __declspec(dllexport) #else #define LIBJ2K_API __declspec(dllimport) #endif #else +#ifdef OPENJPEGSTATIC +#define LIBJ2K_API extern +#else #define LIBJ2K_API #endif - -#if defined(_WIN32) && defined (OPENJPEGSTATIC) && !defined(OPENJPEGDLL) -#define LIBJ2K_API __declspec(dllexport) -#else -#define LIBJ2K_API extern #endif + #ifndef __J2K_H #define __J2K_H