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

   -- BeNours

diff --git a/ChangeLog b/ChangeLog
index 0c86fcfcc655426d4c4664b1cc51db50aee14e06..6a5c904d74cf4d25ec4f4e64822284693da8a5a0 100644 (file)
--- 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 14dbb9ea31c5d8b7ba075b1fb83d0caa2188432d..3ac95d26baa75af4500a29efed29d679cfb5625f 100644 (file)
--- 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 ea92d8900e129b41aebab0022a31deb652b3cf96..1bc77c1d62b9737aae1acc36922f3e6ce7f907db 100644 (file)
--- 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 c7b6f7a424e3f7a55f507445f2ce086102ac62bf..0ec988e6884e9f8180cf179c68306cc12a3e9db0 100644 (file)
--- 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 );