X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Example%2FTestWriteSimple.cxx;h=ee4f15f976c831b46a54cc730992b65c68f637b5;hb=eda9bfda6d03f728b261824ca3b04f596485e288;hp=f194fe0518b6214149118913d895024c0ac8eca5;hpb=ba78e6c6d47d6db1528e8e88e5ebde7296a26692;p=gdcm.git

diff --git a/Example/TestWriteSimple.cxx b/Example/TestWriteSimple.cxx
index f194fe05..ee4f15f9 100644
--- a/Example/TestWriteSimple.cxx
+++ b/Example/TestWriteSimple.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: TestWriteSimple.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/12/03 20:16:55 $
-  Version:   $Revision: 1.6 $
+  Date:      $Date: 2005/02/02 10:06:32 $
+  Version:   $Revision: 1.11 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -15,44 +15,43 @@
      PURPOSE.  See the above copyright notices for more information.
                                                                                 
 =========================================================================*/
-#include "gdcmHeader.h"
 #include "gdcmFile.h"
+#include "gdcmFileHelper.h"
 
-int main(int argc, char* argv[])
+int main(int argc, char *argv[])
 {
+   if (argc < 3) 
+   {
+      std::cerr << "Usage :" << std::endl << argv[0]
+                << " InputFile OutputDicom" << std::endl;
+      return 0;
+   }
 
-  if (argc < 3) 
-    {
-    std::cerr << "Usage :" << std::endl << argv[0] << 
-      " InputHeader OutputDicom" << std::endl;
-    return 0;
-    }
-
-  std::string header = argv[1];
-  const char *output = argv[2];
-
-  gdcm::Header *f1 = new gdcm::Header( header );
-  gdcm::File   *f2 = new gdcm::File( f1 );
-
-  // If the following call is important, then the API sucks. Why is it
-  // required to allocate PixelData when we are not using it !?
-  uint8_t* PixelData = f2->GetImageData(); //EXTREMELY IMPORTANT
-  //Otherwise ReadPixel == -1 -> the dicom writing fails completely
-  
-  int dataSize    = f2->GetImageDataSize();
-  // unsigned char cast is necessary to be able to delete the buffer
-  // since deleting a void* is not allowed in c++
-  uint8_t* imageData = (uint8_t*)f2->GetImageData();
-
-  f2->SetImageData( imageData, dataSize);
-
-  f2->WriteDcmExplVR( output );
-  
-  delete f1;
-  delete f2;
-  //delete PixelData; //Does GetImageData return the same pointer ?
-  (void)PixelData;
-
-  return 0;
+   std::string header = argv[1];
+   const char *output = argv[2];
+
+   gdcm::File       *f1 = new gdcm::File( header );
+   gdcm::FileHelper *f2 = new gdcm::FileHelper( f1 );
+
+   // If the following call is important, then the API sucks. Why is it
+   // required to allocate PixelData when we are not using it !?
+   uint8_t* PixelData = f2->GetImageData(); //EXTREMELY IMPORTANT
+   //Otherwise ReadPixel == -1 -> the dicom writing fails completely
+
+   int dataSize    = f2->GetImageDataSize();
+   // unsigned char cast is necessary to be able to delete the buffer
+   // since deleting a void* is not allowed in c++
+   uint8_t *imageData = (uint8_t *)f2->GetImageData();
+
+   f2->SetImageData( imageData, dataSize );
+
+   f2->WriteDcmExplVR( output );
+
+   delete f1;
+   delete f2;
+   //delete PixelData; //Does GetImageData return the same pointer ?
+   (void)PixelData;
+
+   return 0;
 }