X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmJpeg2000.cxx;h=136d6a54b27e031ae0cd033b75b9c07d98b0483d;hb=56ad78cdf3b5de32f0a94a38cd32ddc9f403ffc3;hp=0f3dd173fd617cf0002170949f2f340b568176c3;hpb=8b4006ce9e262e36f32ed56d877bc31de0a748a1;p=gdcm.git

diff --git a/src/gdcmJpeg2000.cxx b/src/gdcmJpeg2000.cxx
index 0f3dd173..136d6a54 100644
--- a/src/gdcmJpeg2000.cxx
+++ b/src/gdcmJpeg2000.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmJpeg2000.cxx,v $
   Language:  C++
-  Date:      $Date: 2007/07/13 08:17:21 $
-  Version:   $Revision: 1.44 $
+  Date:      $Date: 2008/05/24 12:24:04 $
+  Version:   $Revision: 1.48 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -24,28 +24,11 @@
 #if defined(__BORLANDC__)
    #include <mem.h> // for memset
 #endif
+#include <stdio.h> // for fprintf
+#include <stdlib.h> // for abort
 
 extern "C" {
   #include <openjpeg.h>
-
-/**
-sample error callback expecting a FILE* client object
-*/
-void error_callback(const char *msg, void *) {
-  std::cerr << "Error in gdcmopenjpeg" << msg << std::endl;
-}
-/**
-sample warning callback expecting a FILE* client object
-*/
-void warning_callback(const char *msg, void *) {
-  std::cerr << "Warning in gdcmopenjpeg" << msg << std::endl;
-}
-/**
-sample debug callback expecting no client object
-*/
-void info_callback(const char *msg, void *) {
-  std::cerr << "Info in gdcmopenjpeg" << msg << std::endl;
-}
 }
 
 namespace GDCM_NAME_SPACE 
@@ -62,6 +45,7 @@ namespace GDCM_NAME_SPACE
 /**
 sample error callback expecting a FILE* client object
 */
+extern "C" {
 void error_callback(const char *msg, void *) {
   std::cerr << "Error in gdcmopenjpeg" << msg << std::endl;
 }
@@ -77,6 +61,7 @@ sample debug callback expecting no client object
 void info_callback(const char *msg, void *) {
   std::cerr << "Info in gdcmopenjpeg" << msg << std::endl;
 }
+}
 
 #define J2K_CFMT 0
 #define JP2_CFMT 1
@@ -107,7 +92,7 @@ bool gdcm_read_JPEG2000_file (void* raw, char *inputdata, size_t inputlength)
   opj_dinfo_t* dinfo;  /* handle to a decompressor */
   opj_cio_t *cio;
   unsigned char *src = (unsigned char*)inputdata; 
-  int file_length = inputlength;
+  int file_length = static_cast< int >( inputlength );
 
   /* configure the event callbacks (not required) */
   memset(&event_mgr, 0, sizeof(opj_event_mgr_t));
@@ -372,7 +357,8 @@ bool gdcm_write_JPEG2000_file (std::ostream *fp, char *inputdata, size_t inputle
   /* decode the source image */
   /* ----------------------- */
 
-  image = rawtoimage((char*)inputdata, &parameters, inputlength, 
+  image = rawtoimage((char*)inputdata, &parameters, 
+    static_cast<int>( inputlength ), 
     image_width, image_height,
     sample_pixel, bitsallocated, sign, quality);
   if (!image) {