X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FgdcmPixelWriteConvert.cxx;h=00a3fbf25c6b9df7abdcb6f850cf9144a6ffe01f;hb=6a5de9524996d429cd18c722261421ff4e298681;hp=94359049714d8376129e284d9cc42641dc87d16e;hpb=8b4006ce9e262e36f32ed56d877bc31de0a748a1;p=gdcm.git

diff --git a/src/gdcmPixelWriteConvert.cxx b/src/gdcmPixelWriteConvert.cxx
index 94359049..00a3fbf2 100644
--- a/src/gdcmPixelWriteConvert.cxx
+++ b/src/gdcmPixelWriteConvert.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmPixelWriteConvert.cxx,v $
   Language:  C++
-  Date:      $Date: 2007/07/13 08:17:21 $
-  Version:   $Revision: 1.14 $
+  Date:      $Date: 2007/08/24 10:45:18 $
+  Version:   $Revision: 1.17 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -55,6 +55,7 @@ PixelWriteConvert::PixelWriteConvert()
  */
 PixelWriteConvert::~PixelWriteConvert() 
 {
+   gdcmDebugMacro("PixelWriteConvert::~PixelWriteConvert()" );
    if( Compressed )
      {
      delete[] UserData;
@@ -195,7 +196,7 @@ void UpdateBasicOffsetTable(std::ostream *fp, JpegVector const &v, size_t pos)
     {
     const JpegPair &jp = *i;
     if(i == v.begin() ){ assert( jp.first - first.first == 0); }
-    uint32_t offset = jp.first - first.first;
+    uint32_t offset = (uint32_t)(jp.first - first.first);
     GDCM_NAME_SPACE::binary_write(*fp, offset);
     //std::cerr << "Updating Table:" << jp.first - first.first << std::endl;
     }
@@ -231,7 +232,7 @@ void CloseJpeg(std::ostream *fp, JpegVector &v)
 
 // I need to pass the File*. I do not understand how PixelWriteConvert is supposed
 // to access this information otherwise
-// size can now be computer from File attributes (what an API...)
+// size can now be computed from File attributes (what an API...)
 void PixelWriteConvert::SetCompressJPEG2000UserData(uint8_t *data, size_t size, File *image)
 {
   Compressed = true;
@@ -273,7 +274,7 @@ void PixelWriteConvert::SetCompressJPEG2000UserData(uint8_t *data, size_t size,
      size_t end = of->tellp();
      //static int i = 0;
      JpegPair &jp = JpegFragmentSize[i];
-     jp.second = end-beg;
+     jp.second = (uint32_t)(end-beg);
      if( ((end-beg) % 2) )
        {
        of->put( '\0' );
@@ -294,7 +295,7 @@ void PixelWriteConvert::SetCompressJPEG2000UserData(uint8_t *data, size_t size,
    UserData = new uint8_t[of_size];
    memcpy(UserData, of->str().c_str(), of_size);
    UserDataSize = of_size;
-   
+   delete of;   
 }
 
 bool gdcm_write_JPEG_file8 (std::ostream *fp, char *inputdata, size_t inputlength,
@@ -309,9 +310,6 @@ bool gdcm_write_JPEG_file16 (std::ostream *fp, char *inputdata, size_t inputleng
 
 void PixelWriteConvert::SetCompressJPEGUserData(uint8_t *data, size_t size, File *image)
 {
-
- std::cerr << "entree ds PixelWriteConvert::SetCompressJPEGUserData" << std::endl; 
- 
   (void)data;
   (void)size;
   (void)image;
@@ -320,8 +318,8 @@ void PixelWriteConvert::SetCompressJPEGUserData(uint8_t *data, size_t size, File
 
    std::ostringstream *of = new std::ostringstream();
     int xsize = image->GetXSize();
-   int ysize = image->GetYSize();
-  int zsize =  image->GetZSize();
+    int ysize = image->GetYSize();
+    int zsize = image->GetZSize();
     int samplesPerPixel = image->GetSamplesPerPixel();
    //std::cout << "X: " << xsize << std::endl;
    //std::cout << "Y: " << ysize << std::endl;
@@ -369,7 +367,7 @@ void PixelWriteConvert::SetCompressJPEGUserData(uint8_t *data, size_t size, File
     size_t end = of->tellp();
     //static int i = 0;
     JpegPair &jp = JpegFragmentSize[i];
-      jp.second = end-beg;
+      jp.second = (uint32_t)(end-beg);
     if( ((end-beg) % 2) )
       {
       of->put( '\0' );
@@ -399,8 +397,7 @@ void PixelWriteConvert::SetCompressJPEGUserData(uint8_t *data, size_t size, File
    UserData = new uint8_t[of_size];
    memcpy(UserData, of->str().c_str(), of_size);
    UserDataSize = of_size;
-
- std::cerr << "Sortie ds PixelWriteConvert::SetCompressJPEGUserData" << std::endl; 
+   delete of;
 }