X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=Testing%2FVTKTestReadSeq.cxx;h=e7a35127ca01dd11a3b69dea9586d8ee37ea125f;hb=b19adc9e0168b80e420811c89a93dc114493033c;hp=77d0c30ecf0ea24e4bde75cfcb6a4a1a6b4d338b;hpb=a1632352fa2c6d5bbc306d8bbf70511eac325324;p=gdcm.git diff --git a/Testing/VTKTestReadSeq.cxx b/Testing/VTKTestReadSeq.cxx index 77d0c30e..e7a35127 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/20 16:31:42 $ - Version: $Revision: 1.5 $ + Date: $Date: 2005/02/02 10:05:26 $ + 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 @@ -34,10 +34,9 @@ #define vtkFloatingPointType float #endif -int VTKReadSeqTest(vtkTesting *t,vtkImageViewer *viewer, - std::string const & filename, - std::string const & referenceFileName, - bool show ) +int VTKReadSeqTest(vtkTesting *t, vtkImageViewer *viewer, + std::string const &filename, + 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 )