X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FVTKTestReadSeq.cxx;h=ea92d8900e129b41aebab0022a31deb652b3cf96;hb=587eff0d2fdea1b61c4cc9aa21f06f2ba8b42c10;hp=c2e44aba4eacaeae378d3f0a53fab94156c2f6c3;hpb=7f4872909d3051086acdc83ab6eceb2a14e92f4b;p=gdcm.git diff --git a/Testing/VTKTestReadSeq.cxx b/Testing/VTKTestReadSeq.cxx index c2e44aba..ea92d890 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/19 14:45:40 $ - Version: $Revision: 1.4 $ + Date: $Date: 2005/01/25 11:25:32 $ + Version: $Revision: 1.6 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -15,7 +15,7 @@ PURPOSE. See the above copyright notices for more information. =========================================================================*/ -#include "gdcmFile.h" +#include "gdcmFileHelper.h" #include "vtkGdcmReader.h" #include "vtkImageViewer.h" #include "vtkImageData.h" @@ -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 @@ -67,7 +66,7 @@ int VTKReadSeqTest(vtkTesting *t,vtkImageViewer *viewer, double *range = reader->GetOutput()->GetScalarRange(); // Show - if( show ) + if( viewer ) { viewer->SetInput ( reader->GetOutput() ); viewer->OffScreenRenderingOff(); @@ -215,7 +214,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 +237,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 )