update

[gdcm.git] / src / gdcmFile.cxx

diff --git a/src/gdcmFile.cxx b/src/gdcmFile.cxx
index 500f6f6b4dec528cf51f0761f0b03ad26638708f..aa60bd7683b271c24715a09e712ccb35c61ba194 100644 (file)
--- a/src/gdcmFile.cxx
+++ b/src/gdcmFile.cxx
@@ -224,7 +224,7 @@ size_t gdcmFile::GetImageDataSizeRaw(void) {
  *          NULL if alloc fails 
  */
 void * gdcmFile::GetImageData (void) {
-   PixelData = (void *) malloc(lgrTotale);
+   PixelData = new char[lgrTotale];
    if (PixelData)
       GetImageDataIntoVector(PixelData, lgrTotale);
       
@@ -254,13 +254,14 @@ void * gdcmFile::GetImageData (void) {
  *          failure e.g. MaxSize is lower than necessary.
  */
 size_t gdcmFile::GetImageDataIntoVector (void* destination, size_t MaxSize) {
-   size_t l = GetImageDataIntoVectorRaw (destination, MaxSize);
+   //size_t l = GetImageDataIntoVectorRaw (destination, MaxSize);
+        GetImageDataIntoVectorRaw (destination, MaxSize);
    PixelRead=0 ; // no PixelRaw
    if (!Header->HasLUT())
       return lgrTotale; 
                             
    // from Lut R + Lut G + Lut B
-   unsigned char * newDest = (unsigned char *)malloc(lgrTotale);
+   unsigned char * newDest = new (unsigned char)[lgrTotale];
    unsigned char * a       = (unsigned char *)destination;      
    unsigned char * lutRGBA =                  Header->GetLUTRGBA();
    if (lutRGBA) {          
@@ -273,7 +274,7 @@ size_t gdcmFile::GetImageDataIntoVector (void* destination, size_t MaxSize) {
          *a++ = lutRGBA[j+1];
          *a++ = lutRGBA[j+2];
       }
-      free(newDest);
+      delete[] newDest;
     
    // now, it's an RGB image
    // Lets's write it in the Header
@@ -301,7 +302,7 @@ size_t gdcmFile::GetImageDataIntoVector (void* destination, size_t MaxSize) {
       std::string rgb= "MONOCHROME1 ";      // Photometric Interpretation
       Header->SetEntryByNumber(rgb,0x0028,0x0004);                                
    }            
-   // TODO : Drop Palette Color out of the Header?          
+   /// \todo Drop Palette Color out of the Header?          
    return lgrTotale; 
 }
 
@@ -317,10 +318,10 @@ size_t gdcmFile::GetImageDataIntoVector (void* destination, size_t MaxSize) {
  */
 void * gdcmFile::GetImageDataRaw (void) {
    if (Header->HasLUT())
-      lgrTotale /= 3;  // TODO Let gdcmHeadar user a chance 
-                       // to get the right value
-                      // Create a member lgrTotaleRaw ???
-   PixelData = (void *) malloc(lgrTotale);
+      /// \todo Let gdcmHeadar user a chance to get the right value
+               /// Create a member lgrTotaleRaw ???
+      lgrTotale /= 3;
+   PixelData = new char[lgrTotale];
    if (PixelData)
       GetImageDataIntoVectorRaw(PixelData, lgrTotale);
    PixelRead=1; // PixelRaw
@@ -491,17 +492,17 @@ size_t gdcmFile::GetImageDataIntoVectorRaw (void* destination, size_t MaxSize) {
             int l = Header->GetXSize()*Header->GetYSize();
             int nbFrames = Header->GetZSize();
 
-            unsigned char * newDest = (unsigned char*) malloc(lgrTotale);
+            unsigned char * newDest = new (unsigned char)[lgrTotale];
             unsigned char *x  = newDest;
             unsigned char * a = (unsigned char *)destination;
             unsigned char * b = a + l;
             unsigned char * c = b + l;
             double R,G,B;
 
-            // TODO : Replace by the 'well known' 
-            //        integer computation counterpart
-           // see http://lestourtereaux.free.fr/papers/data/yuvrgb.pdf
-            // for code optimisation
+            /// \todo : Replace by the 'well known' integer computation
+            /// counterpart
+                /// see http://lestourtereaux.free.fr/papers/data/yuvrgb.pdf
+            /// for code optimisation
            
             for (int i=0;i<nbFrames;i++) {
                for (int j=0;j<l; j++) {
@@ -523,7 +524,7 @@ size_t gdcmFile::GetImageDataIntoVectorRaw (void* destination, size_t MaxSize) {
                }
            }
             memmove(destination,newDest,lgrTotale);
-            free(newDest);
+            delete[] newDest;
 
         } else {
          
@@ -532,7 +533,7 @@ size_t gdcmFile::GetImageDataIntoVectorRaw (void* destination, size_t MaxSize) {
 
             int l = Header->GetXSize()*Header->GetYSize()*Header->GetZSize();
 
-            char * newDest = (char*) malloc(lgrTotale);
+            char * newDest = new char[lgrTotale];
             char * x = newDest;
             char * a = (char *)destination;
             char * b = a + l;
@@ -544,7 +545,7 @@ size_t gdcmFile::GetImageDataIntoVectorRaw (void* destination, size_t MaxSize) {
                *(x++) = *(c++);  
             }           
             memmove(destination,newDest,lgrTotale);
-            free(newDest);
+            delete[] newDest;
         }        
          break;
        }     
@@ -566,7 +567,7 @@ size_t gdcmFile::GetImageDataIntoVectorRaw (void* destination, size_t MaxSize) {
    std::string planConfig = "0"; // Planar Configuration
    Header->SetEntryByNumber(planConfig,0x0028,0x0006);
         
-        // TODO : Drop Palette Color out of the Header? 
+        /// \todo Drop Palette Color out of the Header? 
    return lgrTotale; 
 }
 
@@ -698,10 +699,10 @@ bool gdcmFile::WriteBase (std::string fileName, FileType type) {
    if ( (type == ImplicitVR) || (type == ExplicitVR) ) {
       char * filePreamble;
       // writing Dicom File Preamble
-      filePreamble=(char*)calloc(128,1);
+      filePreamble=new char[128];
       fwrite(filePreamble,128,1,fp1);
       fwrite("DICM",4,1,fp1);
-      free (filePreamble);
+      delete[] filePreamble;
    }
 
    // --------------------------------------------------------------
@@ -711,8 +712,8 @@ bool gdcmFile::WriteBase (std::string fileName, FileType type) {
    // we reproduce on disk the switch between lineNumber and columnNumber
    // just before writting ...
    
-   // TODO : the best trick would be *change* the recognition code
-   //        but pb expected if user deals with, e.g. COMPLEX images
+   /// \todo the best trick would be *change* the recognition code
+   ///       but pb expected if user deals with, e.g. COMPLEX images
 
    std::string rows, columns; 
    if ( Header->GetFileType() == ACR_LIBIDO){
@@ -723,7 +724,7 @@ bool gdcmFile::WriteBase (std::string fileName, FileType type) {
    }   
    // ----------------- End of Special Patch ----------------
    
-   // TODO : get the grPixel, numPixel values (for some ACR-NEMA images only)
+   /// \todo get the grPixel, numPixel values (for some ACR-NEMA images only)
    
    guint16 grPixel =Header->GetGrPixel();
    guint16 numPixel=Header->GetNumPixel();;
@@ -958,7 +959,7 @@ bool gdcmFile::ReadPixelData(void* destination) {
       
    if (ln != 0) {
       // What is it used for ?!?
-      char *BasicOffsetTableItemValue = (char *)malloc(ln+1);        
+      char *BasicOffsetTableItemValue = new char[ln+1];
       fread(BasicOffsetTableItemValue,ln,1,fp); 
    }