X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vtk%2FvtkGdcmWriter.cxx;h=2b5764734e7bf721b050436b65e9f878b76bfac8;hb=6f03d7978c122dfc2c7a0ee6bc9f2fd019d98ca3;hp=eacec2afa9045981adda3e171a5e4257d39038bd;hpb=302f16229bfffd6dbf8627e072206f29a3060274;p=gdcm.git

diff --git a/vtk/vtkGdcmWriter.cxx b/vtk/vtkGdcmWriter.cxx
index eacec2af..2b576473 100644
--- a/vtk/vtkGdcmWriter.cxx
+++ b/vtk/vtkGdcmWriter.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: vtkGdcmWriter.cxx,v $
   Language:  C++
-  Date:      $Date: 2006/05/11 15:12:00 $
-  Version:   $Revision: 1.33 $
+  Date:      $Date: 2007/12/13 15:16:19 $
+  Version:   $Revision: 1.36 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -33,12 +33,12 @@
 #define vtkFloatingPointType float
 #endif
 
-vtkCxxRevisionMacro(vtkGdcmWriter, "$Revision: 1.33 $")
+vtkCxxRevisionMacro(vtkGdcmWriter, "$Revision: 1.36 $")
 vtkStandardNewMacro(vtkGdcmWriter)
 
-vtkCxxSetObjectMacro(vtkGdcmWriter,LookupTable,vtkLookupTable);
+vtkCxxSetObjectMacro(vtkGdcmWriter,LookupTable,vtkLookupTable)
 #if (VTK_MAJOR_VERSION >= 5)
-vtkCxxSetObjectMacro(vtkGdcmWriter,MedicalImageProperties,vtkMedicalImageProperties);
+vtkCxxSetObjectMacro(vtkGdcmWriter,MedicalImageProperties,vtkMedicalImageProperties)
 #endif
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
@@ -142,7 +142,7 @@ size_t ReverseData(vtkImageData *image,unsigned char **data)
  * vtkMedicalImageProperties
  */
 #if (VTK_MAJOR_VERSION >= 5)
-void SetMedicalImageInformation(gdcm::FileHelper *file, vtkMedicalImageProperties *medprop)
+void SetMedicalImageInformation(GDCM_NAME_SPACE::FileHelper *file, vtkMedicalImageProperties *medprop)
 {
    // For now only do:
    // PatientName, PatientID, PatientAge, PatientSex, PatientBirthDate, StudyID
@@ -197,7 +197,7 @@ void SetMedicalImageInformation(gdcm::FileHelper *file, vtkMedicalImagePropertie
 /**
  * Set the data informations in the file
  */
-void SetImageInformation(gdcm::FileHelper *file, vtkImageData *image)
+void SetImageInformation(GDCM_NAME_SPACE::FileHelper *file, vtkImageData *image)
 {
    std::ostringstream str;
 
@@ -220,7 +220,7 @@ void SetImageInformation(gdcm::FileHelper *file, vtkImageData *image)
       str.str("");
       str << dim[2];
       //file->Insert(str.str(),0x0028,0x0012); // Planes
-      file->InsertEntryString(str.str(),0x0028,0x0008,"US"); // Number of Frames
+      file->InsertEntryString(str.str(),0x0028,0x0008,"IS"); // Number of Frames
    }
 
    // Pixel type
@@ -403,11 +403,11 @@ void vtkGdcmWriter::RecursiveWrite(int axis, vtkImageData *cache,
 
 void vtkGdcmWriter::WriteDcmFile(char *fileName, vtkImageData *image)
 {
-   gdcm::FileHelper *dcmFile;
+   GDCM_NAME_SPACE::FileHelper *dcmFile;
    if ( GdcmFile != 0)
-      dcmFile = gdcm::FileHelper::New(GdcmFile);
+      dcmFile = GDCM_NAME_SPACE::FileHelper::New(GdcmFile);
    else
-      dcmFile = gdcm::FileHelper::New();
+      dcmFile = GDCM_NAME_SPACE::FileHelper::New();
    
    // From here, the write of the file begins
 
@@ -438,7 +438,7 @@ void vtkGdcmWriter::WriteDcmFile(char *fileName, vtkImageData *image)
          dcmFile->SetWriteTypeToDcmExplVR();
    }
   
-   dcmFile->SetContentType((gdcm::ImageContentType)ContentType);
+   dcmFile->SetContentType((GDCM_NAME_SPACE::ImageContentType)ContentType);
  
    if(!dcmFile->Write(fileName))
    {