First check to extract overlays.

[gdcm.git] / src / gdcmopenjpeg / libopenjpeg / j2k.h

diff --git a/src/gdcmopenjpeg/libopenjpeg/j2k.h b/src/gdcmopenjpeg/libopenjpeg/j2k.h
index 816db8e2a57d8f8a68f77062b27aa2d040e9b705..b42ecf800f44a1109391708a99353cc634e25108 100644 (file)
--- 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 DAVID_WIN32
-#ifdef LIBJ2K_EXPORTS
+#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);
 
-void j2k_dec_release();//antonin
+LIBJ2K_API void j2k_dec_release();/*antonin*/
 
 #endif