X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Example%2FexImageLighten.cxx;h=ba11866493649c960068416adc12ab50fc48e8db;hb=88a0e8d8c47070a680d71eb6a7ac349993e81a5f;hp=b82beab40733659ad4719b0339ef4eee9d6b42f4;hpb=90c918a795e4a1892af2cd120eb20d6311499387;p=gdcm.git

diff --git a/Example/exImageLighten.cxx b/Example/exImageLighten.cxx
index b82beab4..ba118664 100644
--- a/Example/exImageLighten.cxx
+++ b/Example/exImageLighten.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: exImageLighten.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/09/08 14:33:50 $
-  Version:   $Revision: 1.7 $
+  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
@@ -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
@@ -56,8 +55,8 @@ int main(int argc, char *argv[])
 
    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();        
 
@@ -65,6 +64,7 @@ int main(int argc, char *argv[])
        std::cerr << "Sorry, " << fileName <<"  not a gdcm-readable "
                  << "DICOM / ACR File"
                  <<std::endl;
+       f->Delete();
        return 0;
    }
    std::cout << " ... is readable " << std::endl;
@@ -77,8 +77,8 @@ int main(int argc, char *argv[])
    // Pixel Reading must be done here, to be sure 
    // to load the Palettes Color (if any)
 
-   // First, create a gdcm::FileHelper
-   gdcm::FileHelper *fh = new gdcm::FileHelper(f);
+   // First, create a GDCM_NAME_SPACE::FileHelper
+   GDCM_NAME_SPACE::FileHelper *fh = GDCM_NAME_SPACE::FileHelper::New(f);
 
    // Load the pixels, DO NOT transform LUT (if any) into RGB Pixels 
    uint8_t *imageDataRaw = fh->GetImageDataRaw();
@@ -86,10 +86,10 @@ int main(int argc, char *argv[])
    size_t dataRawSize    = fh->GetImageDataRawSize();
 
 // ============================================================
-//   Create a new gdcm::Filehelper, to hold new image.
+//   Create a new GDCM_NAME_SPACE::Filehelper, to hold new image.
 // ============================================================
 
-   gdcm::FileHelper *copy = new gdcm::FileHelper( );
+   GDCM_NAME_SPACE::FileHelper *copy = GDCM_NAME_SPACE::FileHelper::New( );
    copy->SetFileName( output );
    copy->Load();
 
@@ -97,30 +97,24 @@ int main(int argc, char *argv[])
 //   Selective copy of the entries (including Pixel Element).
 // ============================================================
 
-   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::BinEntry *b = dynamic_cast<gdcm::BinEntry*>(d) )
+         if ( GDCM_NAME_SPACE::DataEntry *de = dynamic_cast<GDCM_NAME_SPACE::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
          {
-          // We skip gdcm::SeqEntries
+          // We skip GDCM_NAME_SPACE::SeqEntries
          }
       }
       d = f->GetNextEntry();
@@ -135,9 +129,10 @@ int main(int argc, char *argv[])
    std::cout << std::endl
              << "------------------------------------------------------------"
              << std::endl;
-   delete f;
-   delete fh;
-   delete copy;
+
+   f->Delete();
+   fh->Delete();
+   copy->Delete();
 
    exit (0);
 }