X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vtk%2FvtkGdcmWriter.cxx;h=7baa71ac34a4a177510849a75ec72c2ca713aa5c;hb=5933681dcd56380dd0f7a1477fc1fb3246be8809;hp=ec863d87b489e131f750cfd965bb78082c838db6;hpb=70420bc53075f735997d8b413ec957db691d8726;p=gdcm.git

diff --git a/vtk/vtkGdcmWriter.cxx b/vtk/vtkGdcmWriter.cxx
index ec863d87..7baa71ac 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/09 10:54:57 $
-  Version:   $Revision: 1.32 $
+  Date:      $Date: 2007/06/19 13:09:45 $
+  Version:   $Revision: 1.34 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -33,7 +33,7 @@
 #define vtkFloatingPointType float
 #endif
 
-vtkCxxRevisionMacro(vtkGdcmWriter, "$Revision: 1.32 $")
+vtkCxxRevisionMacro(vtkGdcmWriter, "$Revision: 1.34 $")
 vtkStandardNewMacro(vtkGdcmWriter)
 
 vtkCxxSetObjectMacro(vtkGdcmWriter,LookupTable,vtkLookupTable);
@@ -94,7 +94,11 @@ const char *vtkGdcmWriter::GetWriteTypeAsString()
 // The output data must be deleted by the user of the method !!!
 size_t ReverseData(vtkImageData *image,unsigned char **data)
 {
+#if (VTK_MAJOR_VERSION >= 5)
+   vtkIdType inc[3];
+#else
    int inc[3];
+#endif
    int *extent = image->GetUpdateExtent();
    int dim[3] = {extent[1]-extent[0]+1,
                  extent[3]-extent[2]+1,
@@ -138,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
@@ -193,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;
 
@@ -399,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
 
@@ -434,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))
    {