Use New(), Delete();

[gdcm.git] / Example / exColorToRGB.cxx

diff --git a/Example/exColorToRGB.cxx b/Example/exColorToRGB.cxx
index 55585731466142cdb76b59af99e5a56c84884e3b..6d547945963f4d9a09b5e37f2b46b89dcc8916fc 100644 (file)
--- a/Example/exColorToRGB.cxx
+++ b/Example/exColorToRGB.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: exColorToRGB.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/08/30 15:13:06 $
-  Version:   $Revision: 1.6 $
+  Date:      $Date: 2005/10/25 14:52:27 $
+  Version:   $Revision: 1.9 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -19,8 +19,7 @@
 #include "gdcmFile.h"
 #include "gdcmFileHelper.h"
 #include "gdcmDocument.h"
-#include "gdcmValEntry.h"
-#include "gdcmBinEntry.h"
+#include "gdcmDataEntry.h"
 #include "gdcmSeqEntry.h"
 
 #include <stdlib.h> // for exit
@@ -52,24 +51,28 @@ int main(int argc, char *argv[])
 
    std::cout << argv[1] << std::endl;
 
-   gdcm::File *f = new gdcm::File();
+   gdcm::File *f = gdcm::File::New();
    f->SetLoadMode( gdcm::LD_ALL);
    f->SetFileName( fileName );
    bool res = f->Load();        
 
-   if (!res) {
+   if (!res) 
+   {
        std::cerr << "Sorry, " << fileName <<"  not a gdcm-readable "
                  << "DICOM / ACR File"
                  <<std::endl;
+       f->Delete();
        return 0;
    }
    std::cout << " ... is readable " << std::endl;
 
 /*
-   if (!f->IsMonochrome()) {
+   if (!f->IsMonochrome()) 
+   {
        std::cerr << "Sorry, " << fileName <<"  not a 'color' File "
                  << " "
                  <<std::endl;
+       f->Delete();
        return 0;
    }
 */
@@ -79,9 +82,11 @@ int main(int argc, char *argv[])
 // ============================================================
 
    // We need a gdcm::FileHelper, since we want to load the pixels        
-   gdcm::FileHelper *fh = new gdcm::FileHelper(f);
+   gdcm::FileHelper *fh = gdcm::FileHelper::New(f);
 
-   // (unit8_t DOESN'T mean it's mandatory for the image to be a 8 bits one) 
+   // uint8_t DOESN'T mean it's mandatory for the image to be a 8 bits one !
+   // It's just for prototyping.
+   // Feel free to cast it.
 
    uint8_t *imageData = fh->GetImageData();
 
@@ -89,6 +94,7 @@ int main(int argc, char *argv[])
    {
        std::cerr << "Sorry, Pixels of" << fileName <<"  are not "
                  << " gdcm-readable."       << std::endl;
+       f->Delete();
        return 0;
    }
  
@@ -97,7 +103,7 @@ int main(int argc, char *argv[])
    // ------                              without Sequences     -------------
 
  
-   gdcm::FileHelper *copy = new gdcm::FileHelper( );
+   gdcm::FileHelper *copy = gdcm::FileHelper::New( );
    copy->SetFileName( output );
    copy->Load();
  
@@ -110,17 +116,11 @@ int main(int argc, char *argv[])
            && !( d->GetGroup()%2 ) )
       { 
 
-         if ( gdcm::BinEntry *b = dynamic_cast<gdcm::BinEntry*>(d) )
+         if ( gdcm::DataEntry *de = dynamic_cast<gdcm::DataEntry *>(d) )
          {              
-            copy->GetFile()->InsertBinEntry( b->GetBinArea(),b->GetLength(),
-                                             b->GetGroup(),b->GetElement(),
-                                             b->GetVR() );
-         }
-         else if ( gdcm::ValEntry *v = dynamic_cast<gdcm::ValEntry*>(d) )
-         {   
-             copy->GetFile()->InsertValEntry( v->GetValue(),
-                                              v->GetGroup(),v->GetElement(),
-                                              v->GetVR() ); 
+            copy->GetFile()->InsertEntryBinArea( de->GetBinArea(),de->GetLength(),
+                                                 de->GetGroup(),de->GetElement(),
+                                                 de->GetVR() );
          }
          else
          {
@@ -137,10 +137,9 @@ int main(int argc, char *argv[])
 
    copy->WriteDcmExplVR( output );
 
-
-   delete f;
-   delete fh;
-   delete copy;
+   f->Delete();
+   fh->Delete();
+   copy->Delete();
 
    exit (0);
 }