]> Creatis software - gdcm.git/blobdiff - Testing/VTKTestReadSeq.cxx
* Test/TestDicomdir.cxx : remove memory leaks
[gdcm.git] / Testing / VTKTestReadSeq.cxx
index 77d0c30ecf0ea24e4bde75cfcb6a4a1a6b4d338b..1bc77c1d62b9737aae1acc36922f3e6ce7f907db 100644 (file)
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: VTKTestReadSeq.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/01/20 16:31:42 $
-  Version:   $Revision: 1.5 $
+  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
@@ -36,8 +36,7 @@
 
 int VTKReadSeqTest(vtkTesting *t,vtkImageViewer *viewer,
                    std::string const & filename, 
-                   std::string const & referenceFileName,
-                   bool show )
+                   std::string const & referenceFileName)
 {
    int retVal = 0;  //by default this is an error
 
@@ -64,10 +63,11 @@ int VTKReadSeqTest(vtkTesting *t,vtkImageViewer *viewer,
    delete[] newFileDcm;
    reader->Update();
 
-   double *range = reader->GetOutput()->GetScalarRange();
+   double range[2];
+   reader->GetOutput()->GetScalarRange(range);
 
    // Show
-   if( show )
+   if( viewer )
    {
       viewer->SetInput ( reader->GetOutput() );
       viewer->OffScreenRenderingOff();
@@ -215,7 +215,7 @@ int VTKTestReadSeq(int argc, char *argv[])
    }
    else
    {
-      ret = VTKReadSeqTest(t,viewer,argv[1+show],argv[2+show],show);
+      ret = VTKReadSeqTest(t,viewer,argv[1+show],argv[2+show]);
       t->Delete();
       if( viewer )
          viewer->Delete();
@@ -238,7 +238,7 @@ int VTKTestReadSeq(int argc, char *argv[])
       pngfile = pngfile.substr(0, dot_pos).append( ".png" );
       pngfile.insert( 0, "Baseline/");
       
-      ret += VTKReadSeqTest(t,viewer,filename,pngfile,show);
+      ret += VTKReadSeqTest(t,viewer,filename,pngfile);
    }
    t->Delete();
    if( viewer )