X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2Fgdcmopenjpeg%2Flibopenjpeg%2Fopenjpeg.c;fp=src%2Fgdcmopenjpeg%2Flibopenjpeg%2Fopenjpeg.c;h=6097cdbafdbb708a2b8441799325b44eed9dccc0;hb=bba4d4f75b6c5e373de1a555b7eaadfba961eaaa;hp=9f872e4752ca3d040635c7b785b17143e0eb2984;hpb=80dc5ecf0d3915f6c2a5505a540ff14957e07cc5;p=gdcm.git

diff --git a/src/gdcmopenjpeg/libopenjpeg/openjpeg.c b/src/gdcmopenjpeg/libopenjpeg/openjpeg.c
index 9f872e47..6097cdba 100644
--- a/src/gdcmopenjpeg/libopenjpeg/openjpeg.c
+++ b/src/gdcmopenjpeg/libopenjpeg/openjpeg.c
@@ -24,13 +24,40 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#ifdef WIN32
+#include <windows.h>
+#endif /* WIN32 */
+
 #include "opj_includes.h"
 
-const char * opj_version() {
+/* ---------------------------------------------------------------------- */
+#ifdef WIN32
+#ifndef OPJ_STATIC
+BOOL APIENTRY
+DllMain(HANDLE hModule, DWORD ul_reason_for_call, LPVOID lpReserved) {
+  switch (ul_reason_for_call) {
+    case DLL_PROCESS_ATTACH :
+      break;
+    case DLL_PROCESS_DETACH :
+      break;
+    case DLL_THREAD_ATTACH :
+    case DLL_THREAD_DETACH :
+      break;
+    }
+
+    return TRUE;
+}
+#endif /* OPJ_STATIC */
+#endif /* WIN32 */
+
+/* ---------------------------------------------------------------------- */
+
+
+const char* OPJ_CALLCONV opj_version() {
     return OPENJPEG_VERSION;
 }
 
-opj_dinfo_t* opj_create_decompress(OPJ_CODEC_FORMAT format) {
+opj_dinfo_t* OPJ_CALLCONV opj_create_decompress(OPJ_CODEC_FORMAT format) {
   opj_dinfo_t *dinfo = (opj_dinfo_t*)opj_malloc(sizeof(opj_dinfo_t));
   if(!dinfo) return NULL;
   dinfo->is_decompressor = true;
@@ -52,6 +79,7 @@ opj_dinfo_t* opj_create_decompress(OPJ_CODEC_FORMAT format) {
         return NULL;
       }
       break;
+    case CODEC_UNKNOWN:
     default:
       opj_free(dinfo);
       return NULL;
@@ -62,7 +90,7 @@ opj_dinfo_t* opj_create_decompress(OPJ_CODEC_FORMAT format) {
   return dinfo;
 }
 
-void opj_destroy_decompress(opj_dinfo_t *dinfo) {
+void OPJ_CALLCONV opj_destroy_decompress(opj_dinfo_t *dinfo) {
   if(dinfo) {
     /* destroy the codec */
     switch(dinfo->codec_format) {
@@ -73,13 +101,16 @@ void opj_destroy_decompress(opj_dinfo_t *dinfo) {
       case CODEC_JP2:
         jp2_destroy_decompress((opj_jp2_t*)dinfo->jp2_handle);
         break;
+      case CODEC_UNKNOWN:
+      default:
+        break;
     }
     /* destroy the decompressor */
     opj_free(dinfo);
   }
 }
 
-void opj_set_default_decoder_parameters(opj_dparameters_t *parameters) {
+void OPJ_CALLCONV opj_set_default_decoder_parameters(opj_dparameters_t *parameters) {
   if(parameters) {
     memset(parameters, 0, sizeof(opj_dparameters_t));
     /* default decoding parameters */
@@ -91,7 +122,7 @@ void opj_set_default_decoder_parameters(opj_dparameters_t *parameters) {
   }
 }
 
-void opj_setup_decoder(opj_dinfo_t *dinfo, opj_dparameters_t *parameters) {
+void OPJ_CALLCONV opj_setup_decoder(opj_dinfo_t *dinfo, opj_dparameters_t *parameters) {
   if(dinfo && parameters) {
     switch(dinfo->codec_format) {
       case CODEC_J2K:
@@ -101,11 +132,14 @@ void opj_setup_decoder(opj_dinfo_t *dinfo, opj_dparameters_t *parameters) {
       case CODEC_JP2:
         jp2_setup_decoder((opj_jp2_t*)dinfo->jp2_handle, parameters);
         break;
+      case CODEC_UNKNOWN:
+      default:
+        break;
     }
   }
 }
 
-opj_image_t* opj_decode(opj_dinfo_t *dinfo, opj_cio_t *cio) {
+opj_image_t* OPJ_CALLCONV opj_decode(opj_dinfo_t *dinfo, opj_cio_t *cio) {
   if(dinfo && cio) {
     switch(dinfo->codec_format) {
       case CODEC_J2K:
@@ -114,13 +148,16 @@ opj_image_t* opj_decode(opj_dinfo_t *dinfo, opj_cio_t *cio) {
         return j2k_decode_jpt_stream((opj_j2k_t*)dinfo->j2k_handle, cio);
       case CODEC_JP2:
         return jp2_decode((opj_jp2_t*)dinfo->jp2_handle, cio);
+      case CODEC_UNKNOWN:
+      default:
+        break;
     }
   }
 
   return NULL;
 }
 
-opj_cinfo_t* opj_create_compress(OPJ_CODEC_FORMAT format) {
+opj_cinfo_t* OPJ_CALLCONV opj_create_compress(OPJ_CODEC_FORMAT format) {
   opj_cinfo_t *cinfo = (opj_cinfo_t*)opj_malloc(sizeof(opj_cinfo_t));
   if(!cinfo) return NULL;
   cinfo->is_decompressor = false;
@@ -141,6 +178,8 @@ opj_cinfo_t* opj_create_compress(OPJ_CODEC_FORMAT format) {
         return NULL;
       }
       break;
+    case CODEC_JPT:
+    case CODEC_UNKNOWN:
     default:
       opj_free(cinfo);
       return NULL;
@@ -151,7 +190,7 @@ opj_cinfo_t* opj_create_compress(OPJ_CODEC_FORMAT format) {
   return cinfo;
 }
 
-void opj_destroy_compress(opj_cinfo_t *cinfo) {
+void OPJ_CALLCONV opj_destroy_compress(opj_cinfo_t *cinfo) {
   if(cinfo) {
     /* destroy the codec */
     switch(cinfo->codec_format) {
@@ -161,13 +200,17 @@ void opj_destroy_compress(opj_cinfo_t *cinfo) {
       case CODEC_JP2:
         jp2_destroy_decompress((opj_jp2_t*)cinfo->jp2_handle);
         break;
+      case CODEC_JPT:
+      case CODEC_UNKNOWN:
+      default:
+        break;
     }
     /* destroy the decompressor */
     opj_free(cinfo);
   }
 }
 
-void opj_set_default_encoder_parameters(opj_cparameters_t *parameters) {
+void OPJ_CALLCONV opj_set_default_encoder_parameters(opj_cparameters_t *parameters) {
   if(parameters) {
     memset(parameters, 0, sizeof(opj_cparameters_t));
     /* default coding parameters */
@@ -184,7 +227,7 @@ void opj_set_default_encoder_parameters(opj_cparameters_t *parameters) {
   }
 }
 
-void opj_setup_encoder(opj_cinfo_t *cinfo, opj_cparameters_t *parameters, opj_image_t *image) {
+void OPJ_CALLCONV opj_setup_encoder(opj_cinfo_t *cinfo, opj_cparameters_t *parameters, opj_image_t *image) {
   if(cinfo && parameters && image) {
     switch(cinfo->codec_format) {
       case CODEC_J2K:
@@ -193,17 +236,25 @@ void opj_setup_encoder(opj_cinfo_t *cinfo, opj_cparameters_t *parameters, opj_im
       case CODEC_JP2:
         jp2_setup_encoder((opj_jp2_t*)cinfo->jp2_handle, parameters, image);
         break;
+      case CODEC_JPT:
+      case CODEC_UNKNOWN:
+      default:
+        break;
     }
   }
 }
 
-bool opj_encode(opj_cinfo_t *cinfo, opj_cio_t *cio, opj_image_t *image, char *index) {
+bool OPJ_CALLCONV opj_encode(opj_cinfo_t *cinfo, opj_cio_t *cio, opj_image_t *image, char *index) {
   if(cinfo && cio && image) {
     switch(cinfo->codec_format) {
       case CODEC_J2K:
         return j2k_encode((opj_j2k_t*)cinfo->j2k_handle, cio, image, index);
       case CODEC_JP2:
         return jp2_encode((opj_jp2_t*)cinfo->jp2_handle, cio, image, index);
+      case CODEC_JPT:
+      case CODEC_UNKNOWN:
+      default:
+        break;
     }
   }