X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2Fgdcmopenjpeg%2Flibopenjpeg%2Fj2k.h;h=b42ecf800f44a1109391708a99353cc634e25108;hb=e362e154b84f087750d1ed1f6671a34b3bf5ff7a;hp=7c31d207f80f6b3991ac1dbd61f8ba6e8ddfd4b0;hpb=1f1fdedc6596e5b1da08c53918cd91796e1e1743;p=gdcm.git diff --git a/src/gdcmopenjpeg/libopenjpeg/j2k.h b/src/gdcmopenjpeg/libopenjpeg/j2k.h index 7c31d207..b42ecf80 100644 --- a/src/gdcmopenjpeg/libopenjpeg/j2k.h +++ b/src/gdcmopenjpeg/libopenjpeg/j2k.h @@ -26,17 +26,22 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#define VERSION "0.0.8" +#define VERSION "0.0.9" -#ifdef _WIN32 /*DAVID_WIN32*/ +#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 +#endif + #ifndef __J2K_H #define __J2K_H