* Test/TestDicomdir.cxx : remove memory leaks

[gdcm.git] / Example / WriteRead.cxx

diff --git a/Example/WriteRead.cxx b/Example/WriteRead.cxx
index 7e75baaeee21c00110375660d4e32b81a310145d..b5a5a9415f5e0f8820d7af6018a34c11b536cac2 100644 (file)
--- a/Example/WriteRead.cxx
+++ b/Example/WriteRead.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: WriteRead.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/12/03 20:16:56 $
-  Version:   $Revision: 1.9 $
+  Date:      $Date: 2005/01/21 11:40:53 $
+  Version:   $Revision: 1.12 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
                                                                                 
 =========================================================================*/
-#include "gdcmHeader.h"
 #include "gdcmFile.h"
+#include "gdcmFileHelper.h"
 
 #include <iostream>
 
@@ -24,8 +24,8 @@ int main(int argc, char* argv[])
 {  
    std::string zozo;
 
-   gdcm::Header* e1, *e2;
-   gdcm::File  * f1, *f2;
+   gdcm::File* e1, *e2;
+   gdcm::FileHelper  * f1, *f2;
 
    uint8_t* imageData, *imageData2;
    int dataSize, dataSize2;
@@ -42,14 +42,14 @@ int main(int argc, char* argv[])
 
    std::cout << argv[1] << std::endl;
 
-   e1 = new gdcm::Header( toto );
+   e1 = new gdcm::File( toto );
    if (!e1->IsReadable()) {
        std::cerr << "Sorry, " << toto <<"  not a Readable DICOM / ACR File"
                  <<std::endl;
        return 0;
    }
    
-   f1 = new gdcm::File(e1);
+   f1 = new gdcm::FileHelper(e1);
    imageData= f1->GetImageData();
    dataSize = f1->GetImageDataSize();
 
@@ -61,13 +61,13 @@ int main(int argc, char* argv[])
 
 // --------------------- we read the written image
       
-   e2 = new gdcm::Header( zozo );
+   e2 = new gdcm::File( zozo );
    if (!e2->IsReadable()) {
        std::cerr << "Sorry, " << zozo << " not a Readable DICOM / ACR File"  
                  <<std::endl;
        return 0;
    }
-   f2 = new gdcm::File(e2);
+   f2 = new gdcm::FileHelper(e2);
    imageData2= f2->GetImageData();
    dataSize2 = f2->GetImageDataSize();