BUG: Comitting patch from JPR, to support IRAD Data Set

[gdcm.git] / Example / WriteRead.cxx

diff --git a/Example/WriteRead.cxx b/Example/WriteRead.cxx
index 803d8e10ab3d5dbd5de3b6589a27ca868a202b43..fab3f75dac2851d9b6746cf1b8b8688186a6ebf3 100644 (file)
--- a/Example/WriteRead.cxx
+++ b/Example/WriteRead.cxx
@@ -1,3 +1,20 @@
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: WriteRead.cxx,v $
+  Language:  C++
+  Date:      $Date: 2004/11/16 04:26:18 $
+  Version:   $Revision: 1.8 $
+                                                                                
+  Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
+  l'Image). All rights reserved. See Doc/License.txt or
+  http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details.
+                                                                                
+     This software is distributed WITHOUT ANY WARRANTY; without even
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+     PURPOSE.  See the above copyright notices for more information.
+                                                                                
+=========================================================================*/
 #include <iostream>
 #include <stdio.h>
 #include "gdcm.h"
@@ -7,10 +24,10 @@ int main(int argc, char* argv[])
    std::string toto;
    char zozo[200];
 
-   gdcmHeader* e1, *e2;
-   gdcmFile  * f1, *f2;
+   gdcm::Header* e1, *e2;
+   gdcm::File  * f1, *f2;
 
-   void* imageData, *imageData2;
+   uint8_t* imageData, *imageData2;
    int dataSize, dataSize2;
      
    if( argc < 2 )
@@ -25,14 +42,14 @@ int main(int argc, char* argv[])
 
    std::cout << argv[1] << std::endl;
 
-   e1 = new gdcmHeader( toto );
+   e1 = new gdcm::Header( toto );
    if (!e1->IsReadable()) {
        std::cerr << "Sorry, " << toto <<"  not a Readable DICOM / ACR File"
                  <<std::endl;
        return 0;
    }
    
-   f1 = new gdcmFile(e1);
+   f1 = new gdcm::File(e1);
    imageData= f1->GetImageData();
    dataSize = f1->GetImageDataSize();
 
@@ -44,13 +61,13 @@ int main(int argc, char* argv[])
 
 // --------------------- we read the written image
       
-   e2 = new gdcmHeader( zozo );
+   e2 = new gdcm::Header( zozo );
    if (!e2->IsReadable()) {
        std::cerr << "Sorry, " << zozo << " not a Readable DICOM / ACR File"  
                  <<std::endl;
        return 0;
    }
-   f2 = new gdcmFile(e2);
+   f2 = new gdcm::File(e2);
    imageData2= f2->GetImageData();
    dataSize2 = f2->GetImageDataSize();