* src/gdcmDicomDirObject.h : set the FillObject method in protected.

[gdcm.git] / Testing / TestCopyDicom.cxx

diff --git a/Testing/TestCopyDicom.cxx b/Testing/TestCopyDicom.cxx
index 3a86991244d95ae696b663a4ca68a316f44c5467..1d26baeff58071e192b0efd342e9bae7eab78c3e 100644 (file)
--- a/Testing/TestCopyDicom.cxx
+++ b/Testing/TestCopyDicom.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: TestCopyDicom.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/01/06 14:49:15 $
-  Version:   $Revision: 1.27 $
+  Date:      $Date: 2005/01/19 08:58:33 $
+  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
@@ -62,7 +62,6 @@ int CopyDicom(std::string const & filename,
       std::cout << "   Testing: " << filename << std::endl;
       if( FileExists( output.c_str() ) )
       {
-        // std::cerr << "Don't try to cheat, I am removing the file anyway" << std::endl;
          if( !RemoveFile( output.c_str() ) )
          {
             std::cout << "Ouch, the file exist, but I cannot remove it" << std::endl;
@@ -79,20 +78,15 @@ int CopyDicom(std::string const & filename,
   
       // Warning :Accessor gdcmElementSet::GetEntry() should not exist 
       // It was commented out by Mathieu, that was a *good* idea
-      // (the user does NOT have to know the way we implemented the Header !)
-      // Waiting for a 'clean' solution, I keep the method ...JPRx
-
 
       //////////////// Step 2:
       std::cout << "2...";
-      originalH->Initialize();
-      gdcm::DocEntry* d=originalH->GetNextEntry();
-
+      gdcm::DocEntry* d=originalH->GetFirstEntry();
       while(d)
       {
          if ( gdcm::BinEntry* b = dynamic_cast<gdcm::BinEntry*>(d) )
          {
-            copyH->ReplaceOrCreateByNumber( 
+            copyH->ReplaceOrCreate( 
                                  b->GetBinArea(),
                                  b->GetLength(),
                                  b->GetGroup(), 
@@ -101,7 +95,7 @@ int CopyDicom(std::string const & filename,
          }
          else if ( gdcm::ValEntry* v = dynamic_cast<gdcm::ValEntry*>(d) )
          {   
-             copyH->ReplaceOrCreateByNumber( 
+             copyH->ReplaceOrCreate( 
                                  v->GetValue(),
                                  v->GetGroup(), 
                                  v->GetElement(),