X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Example%2FexColorToRGB.cxx;h=e056b039dd5dccae467d09481bd03646dab603cf;hb=7807e926c2319c5adfc037665992307222bc8f27;hp=12964570530162b71ebace9b7d27f840179257ba;hpb=bc69950a406d06c50f0fb75a96572784965cb534;p=gdcm.git

diff --git a/Example/exColorToRGB.cxx b/Example/exColorToRGB.cxx
index 12964570..e056b039 100644
--- a/Example/exColorToRGB.cxx
+++ b/Example/exColorToRGB.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: exColorToRGB.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/10/18 08:35:43 $
-  Version:   $Revision: 1.8 $
+  Date:      $Date: 2007/05/23 14:18:05 $
+  Version:   $Revision: 1.10 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -47,28 +47,32 @@ int main(int argc, char *argv[])
 // ============================================================
 //   Read the input image.
 // ============================================================
-   // a gdcm::File contains all the Dicom Field but the Pixels Element
+   // a GDCM_NAME_SPACE::File contains all the Dicom Field but the Pixels Element
 
    std::cout << argv[1] << std::endl;
 
-   gdcm::File *f = new gdcm::File();
-   f->SetLoadMode( gdcm::LD_ALL);
+   GDCM_NAME_SPACE::File *f = GDCM_NAME_SPACE::File::New();
+   f->SetLoadMode( GDCM_NAME_SPACE::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;
    }
 */
@@ -77,8 +81,8 @@ int main(int argc, char *argv[])
 //   Load the pixels in memory.
 // ============================================================
 
-   // We need a gdcm::FileHelper, since we want to load the pixels        
-   gdcm::FileHelper *fh = new gdcm::FileHelper(f);
+   // We need a GDCM_NAME_SPACE::FileHelper, since we want to load the pixels        
+   GDCM_NAME_SPACE::FileHelper *fh = GDCM_NAME_SPACE::FileHelper::New(f);
 
    // uint8_t DOESN'T mean it's mandatory for the image to be a 8 bits one !
    // It's just for prototyping.
@@ -90,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;
    }
  
@@ -98,20 +103,20 @@ int main(int argc, char *argv[])
    // ------                              without Sequences     -------------
 
  
-   gdcm::FileHelper *copy = new gdcm::FileHelper( );
+   GDCM_NAME_SPACE::FileHelper *copy = GDCM_NAME_SPACE::FileHelper::New( );
    copy->SetFileName( output );
    copy->Load();
  
-   gdcm::DocEntry *d = f->GetFirstEntry();
+   GDCM_NAME_SPACE::DocEntry *d = f->GetFirstEntry();
    while(d)
    {
       // We skip SeqEntries, since user cannot do much with them
-      if ( !(dynamic_cast<gdcm::SeqEntry*>(d))
+      if ( !(dynamic_cast<GDCM_NAME_SPACE::SeqEntry*>(d))
       // We skip Shadow Groups, since nobody knows what they mean
            && !( d->GetGroup()%2 ) )
       { 
 
-         if ( gdcm::DataEntry *de = dynamic_cast<gdcm::DataEntry *>(d) )
+         if ( GDCM_NAME_SPACE::DataEntry *de = dynamic_cast<GDCM_NAME_SPACE::DataEntry *>(d) )
          {              
             copy->GetFile()->InsertEntryBinArea( de->GetBinArea(),de->GetLength(),
                                                  de->GetGroup(),de->GetElement(),
@@ -119,7 +124,7 @@ int main(int argc, char *argv[])
          }
          else
          {
-          // We skip gdcm::SeqEntries
+          // We skip GDCM_NAME_SPACE::SeqEntries
          }
       }
       d = f->GetNextEntry();
@@ -132,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);
 }