From: regrain <regrain>
Date: Tue, 25 Jan 2005 15:45:48 +0000 (+0000)
Subject:    * Test/VTKTest*.cxx : bug fix under linux
X-Git-Tag: Version1.0.bp~191
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=da0155a9bc9a9b6f7e9194ed5c7e7f4ff9799e7c;p=gdcm.git

   * Test/VTKTest*.cxx : bug fix under linux
   -- BeNours
---

diff --git a/ChangeLog b/ChangeLog
index 0c86fcfc..6a5c904d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2005-01-25 Benoit Regrain <Benoit.Regrain@creatis.insa-lyon.fr>
+   * Test/VTKTest*.cxx : bug fix under linux
+
 2005-01-25 Benoit Regrain <Benoit.Regrain@creatis.insa-lyon.fr>
    * src/ : rename some methods on Entry (SetXxx, InsertXxx) to have a better
      use with python. Some methods ard moved from Document to ElementSet or
diff --git a/Testing/VTKTestRead.cxx b/Testing/VTKTestRead.cxx
index 14dbb9ea..3ac95d26 100644
--- a/Testing/VTKTestRead.cxx
+++ b/Testing/VTKTestRead.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: VTKTestRead.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/01/25 11:25:32 $
-  Version:   $Revision: 1.7 $
+  Date:      $Date: 2005/01/25 15:45:49 $
+  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
@@ -25,6 +25,8 @@
 #include "vtkImageAppendComponents.h"
 #include "vtkImageShiftScale.h"
 
+#include "vtkPNGWriter.h"
+
 #include <iostream>
 
 //Generated file:
@@ -63,7 +65,8 @@ int VTKReadTest(vtkTesting *t,vtkImageViewer *viewer,
    reader->SetFileName( "TestWrite.dcm" );
    reader->Update();
 
-   double *range=reader->GetOutput()->GetScalarRange();
+   double range[2];
+   reader->GetOutput()->GetScalarRange(range);
    int dim[3];
    reader->GetOutput()->GetDimensions( dim );
 
@@ -124,7 +127,6 @@ int VTKReadTest(vtkTesting *t,vtkImageViewer *viewer,
 
    // Set an unsigned char image
    // Shift/Scale the image 
-   image->Update();
    vtkImageShiftScale *iss=vtkImageShiftScale::New();
    iss->SetInput(image);
    iss->SetOutputScalarTypeToUnsignedChar();
diff --git a/Testing/VTKTestReadSeq.cxx b/Testing/VTKTestReadSeq.cxx
index ea92d890..1bc77c1d 100644
--- a/Testing/VTKTestReadSeq.cxx
+++ b/Testing/VTKTestReadSeq.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: VTKTestReadSeq.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/01/25 11:25:32 $
-  Version:   $Revision: 1.6 $
+  Date:      $Date: 2005/01/25 15:45:49 $
+  Version:   $Revision: 1.7 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -63,7 +63,8 @@ int VTKReadSeqTest(vtkTesting *t,vtkImageViewer *viewer,
    delete[] newFileDcm;
    reader->Update();
 
-   double *range = reader->GetOutput()->GetScalarRange();
+   double range[2];
+   reader->GetOutput()->GetScalarRange(range);
 
    // Show
    if( viewer )
diff --git a/Testing/VTKTestWrite.cxx b/Testing/VTKTestWrite.cxx
index c7b6f7a4..0ec988e6 100644
--- a/Testing/VTKTestWrite.cxx
+++ b/Testing/VTKTestWrite.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: VTKTestWrite.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/01/25 11:25:32 $
-  Version:   $Revision: 1.6 $
+  Date:      $Date: 2005/01/25 15:45:49 $
+  Version:   $Revision: 1.7 $
 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -68,7 +68,8 @@ int VTKWriteTest(vtkTesting *t,vtkImageViewer *viewer,
    reader->SetFileName( "TestWrite.dcm" );
    reader->Update();
 
-   double *range=reader->GetOutput()->GetScalarRange();
+   double range[2];
+   reader->GetOutput()->GetScalarRange(range);
    int dim[3];
    reader->GetOutput()->GetDimensions( dim );