X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Example%2FTestCopyDicom.cxx;h=3c4a579a1254ab5c71bc042a7e9bf0fe2fb25dda;hb=fe2d1ed161ad70897d6aaeda19965ffb68f8bb66;hp=423a3ded8ce7d0adfa6148b0b3ae75b64848aa49;hpb=3e82e8b67eddf5d4b95b6aa2a2e2615aced4c452;p=gdcm.git

diff --git a/Example/TestCopyDicom.cxx b/Example/TestCopyDicom.cxx
index 423a3ded..3c4a579a 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 10:06:31 $
-  Version:   $Revision: 1.23 $
+  Date:      $Date: 2005/09/07 08:33:29 $
+  Version:   $Revision: 1.27 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -57,7 +57,7 @@ bool RemoveFile(const char *source)
 // Here we load a gdcmFile and then try to create from scratch a copy of it,
 // copying field by field the dicom image
 
-int main(int argc, char* argv[])
+int main(int argc, char *argv[])
 {
    if (argc < 3)
    {
@@ -80,16 +80,23 @@ int main(int argc, char* argv[])
             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;
+      gdcm::FileHelper *copy = new gdcm::FileHelper( );
+      copy->SetFileName( output );
+      copy->Load();
+
+      size_t dataSize;
+      uint8_t *imageData;
+      dataSize = original->GetImageDataSize();
+      imageData = original->GetImageData();
+      (void)imageData; // no enough to avoid warning on 'Golgot'
       (void)dataSize;
   
       //First of all copy the header field by field
@@ -112,10 +119,10 @@ int main(int argc, char* argv[])
          else
          {
           // We skip pb of SQ recursive exploration
-          //std::cout << "Skipped Sequence " 
-          //          << "------------- " << d->GetVR() << " "<< std::hex
-          //          << d->GetGroup() << " " << d->GetElement()
-          //  << std::endl;    
+          std::cout << "Skipped Sequence " 
+                    << "------------- " << d->GetVR() << " "<< std::hex
+                    << d->GetGroup() << "," << d->GetElement()
+                    << std::endl;    
          }
 
          d=original->GetFile()->GetNextEntry();