COMP: Compilation was broken on borland/vc6

[gdcm.git] / Example / Write.cxx

diff --git a/Example/Write.cxx b/Example/Write.cxx
index dbc5303882ba7ee4ba9ad6d1ce29c10d3d8a6424..b9632bda2a4da7a581ce57e53908b364972ba511 100644 (file)
--- a/Example/Write.cxx
+++ b/Example/Write.cxx
@@ -1,3 +1,20 @@
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: Write.cxx,v $
+  Language:  C++
+  Date:      $Date: 2004/11/16 04:26:18 $
+  Version:   $Revision: 1.9 $
+                                                                                
+  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,11 +24,11 @@ int main(int argc, char* argv[])
    std::string toto;
    char zozo[200];
 
-   gdcmHeader* e1;
-   gdcmFile  * f1;
+   gdcm::Header* e1;
+   gdcm::File  * f1;
 
    //gdcmDocument * d;  //not used
-   void* imageData;
+   uint8_t* imageData;
    int dataSize;
 
    if (argc < 3) {
@@ -45,14 +62,14 @@ int main(int argc, char* argv[])
      
    toto = argv[1]; 
 
-   e1 = new gdcmHeader(toto.c_str(), false, true);
+   e1 = new gdcm::Header( toto.c_str() );
    if (!e1->IsReadable()) {
        std::cerr << "Sorry, not a Readable DICOM / ACR File"  <<std::endl;
        return 0;
    }
   // e1->Print(); 
    
-   f1 = new gdcmFile(e1);
+   f1 = new gdcm::File(e1);
 // ---     
 
    dataSize = f1->GetImageDataSize();
@@ -87,11 +104,12 @@ int main(int argc, char* argv[])
       && transferSyntaxName != "Uncompressed ACR-NEMA"     ) {
       std::cout << std::endl << "==========================================="
                 << std::endl; 
-      f1->ParsePixelData();
+      f1->GetPixelConverter()->Print();
       std::cout << std::endl << "==========================================="
                 << std::endl; 
    }
    imageData= f1->GetImageData();
+   (void)imageData;  // to avoid warnings
 
    switch (argv[2][0]) {
    case 'a' :