X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Example%2FTestCopyDicom.cxx;h=081c58c1ee7da1ddd4c7394830048f009661ace7;hb=c003ab063e99853986884357c1284dfbabc4afff;hp=9916f6a44108ae5111390d5e56f9c1829d1640ce;hpb=3a687f362b29fd54cbc5377b8138e6d8c9b4cd92;p=gdcm.git

diff --git a/Example/TestCopyDicom.cxx b/Example/TestCopyDicom.cxx
index 9916f6a4..081c58c1 100644
--- a/Example/TestCopyDicom.cxx
+++ b/Example/TestCopyDicom.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: TestCopyDicom.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/09/22 14:45:11 $
-  Version:   $Revision: 1.29 $
+  Date:      $Date: 2005/10/18 08:35:43 $
+  Version:   $Revision: 1.31 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -18,8 +18,7 @@
 #include "gdcmFile.h"
 #include "gdcmFileHelper.h"
 #include "gdcmDocument.h"
-#include "gdcmValEntry.h"
-#include "gdcmBinEntry.h"
+#include "gdcmDataEntry.h"
 
 #ifndef _WIN32
 #include <unistd.h> //for access, unlink
@@ -99,7 +98,7 @@ int main(int argc, char *argv[])
       //dataSize = original->GetImageDataSize();// just an accesor :useless here
       
       imageData = original->GetImageData(); // VERY important : 
-                                      // brings pixels in memory !
+                                      // brings pixels into memory !
       //(void)imageData; // not enough to avoid warning with icc compiler
       //(void)dataSize; //  not enough to avoid warning on 'Golgot'
   
@@ -110,17 +109,11 @@ int main(int argc, char *argv[])
       gdcm::DocEntry *d = original->GetFile()->GetFirstEntry();
       while(d)
       {
-         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
          {
@@ -144,7 +137,11 @@ int main(int argc, char *argv[])
       std::cout << "--- ---- ----------------------" << std::endl;
    
       copy->WriteDcmExplVR( output );
+      
 
+      delete fileOr;   // File
+      delete original; // FileHelper
+      delete copy;     // FileHelper
       return 0;
 }