X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Example%2FTestCopyDicom.cxx;h=081c58c1ee7da1ddd4c7394830048f009661ace7;hb=97811f429fdf36ed2d7404e41ce7817c65e96e32;hp=554f3a5c72a1d87b7b3526ef14369379315a40c1;hpb=bbfa3cf89fc2ede7c43259e945f021044b56069f;p=gdcm.git

diff --git a/Example/TestCopyDicom.cxx b/Example/TestCopyDicom.cxx
index 554f3a5c..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/02/02 14:26:30 $
-  Version:   $Revision: 1.24 $
+  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
@@ -73,41 +72,48 @@ int main(int argc, char *argv[])
 
       if( FileExists( output.c_str() ) )
       {
-         std::cerr << "Don't try to cheat, I am removing the file anyway" << std::endl;
+         std::cerr << "Don't try to cheat, I am removing the file anyway" 
+                   << std::endl;
          if( !RemoveFile( output.c_str() ) )
          {
-            std::cerr << "Ouch, the file exist, but I cannot remove it" << std::endl;
+            std::cerr << "Ouch, the file exist, but I cannot remove it" 
+                      << std::endl;
             return 1;
          }
       }
-      gdcm::FileHelper *original = new gdcm::FileHelper( filename );
+      gdcm::File *fileOr = new gdcm::File();
+      fileOr->SetFileName( filename );
+      fileOr->Load();
+      gdcm::FileHelper *original = new gdcm::FileHelper( fileOr );
    
       std::cout << "--- Original ----------------------" << std::endl;
       //original->GetFile()->Print();
    
-      gdcm::FileHelper *copy = new gdcm::FileHelper( output );
-
-      size_t dataSize = original->GetImageDataSize();
-      uint8_t *imageData = original->GetImageData();
-      (void)imageData;
-      (void)dataSize;
+      gdcm::FileHelper *copy = new gdcm::FileHelper( );
+      copy->SetFileName( output );
+      copy->Load();
+
+      //size_t dataSize;
+      uint8_t *imageData;
+      //dataSize = original->GetImageDataSize();// just an accesor :useless here
+      
+      imageData = original->GetImageData(); // VERY important : 
+                                      // brings pixels into memory !
+      //(void)imageData; // not enough to avoid warning with icc compiler
+      //(void)dataSize; //  not enough to avoid warning on 'Golgot'
   
+      std::cout << imageData << std::endl; // to avoid warning ?
+
       //First of all copy the header field by field
 
       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
          {
@@ -125,12 +131,17 @@ int main(int argc, char *argv[])
       //copy->SetImageData(imageData, dataSize);
 
       std::cout << "--- Copy ----------------------" << std::endl;
-      std::cout <<std::endl << "DO NOT care about Offset"  <<std::endl<<std::endl;; 
+      std::cout <<std::endl << "DO NOT care about Offset"  
+                <<std::endl << std::endl;; 
       copy->GetFile()->Print();
       std::cout << "--- ---- ----------------------" << std::endl;
    
       copy->WriteDcmExplVR( output );
+      
 
+      delete fileOr;   // File
+      delete original; // FileHelper
+      delete copy;     // FileHelper
       return 0;
 }