X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2Fgdcmopenjpeg%2Flibopenjpeg%2Fj2k.h;h=c6a66b2900e09b8fb3cd582b3a6a0d2b86a03196;hb=6c1b9eb78c07847c3dbfeccc55e031df5cf47a5f;hp=a4645c3c8bd970d87890defa836e0621fb2794e2;hpb=c05057b4094e9642e53379d701818c5fb8c452e9;p=gdcm.git

diff --git a/src/gdcmopenjpeg/libopenjpeg/j2k.h b/src/gdcmopenjpeg/libopenjpeg/j2k.h
index a4645c3c..c6a66b29 100644
--- a/src/gdcmopenjpeg/libopenjpeg/j2k.h
+++ b/src/gdcmopenjpeg/libopenjpeg/j2k.h
@@ -28,15 +28,20 @@
 
 #define VERSION "0.0.8"
 
-#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
@@ -231,6 +236,6 @@ LIBJ2K_API int j2k_decode(unsigned char *src, int len, j2k_image_t * img,
 int j2k_decode_jpt_stream(unsigned char *src, int len, j2k_image_t * img,
            j2k_cp_t * cp);
 
-LIBJ2K_API void j2k_dec_release();//antonin
+LIBJ2K_API void j2k_dec_release();/*antonin*/
 
 #endif