From: regrain Date: Tue, 25 Jan 2005 11:25:31 +0000 (+0000) Subject: * Test/VTKTest*.cxx : remove the show variable in each test method because X-Git-Tag: Version1.0.bp~197 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=587eff0d2fdea1b61c4cc9aa21f06f2ba8b42c10;p=gdcm.git * Test/VTKTest*.cxx : remove the show variable in each test method because it's useless (the viewer variable replace this variable) -- BeNours --- diff --git a/ChangeLog b/ChangeLog index f7c038a8..c094101d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2005-01-25 Benoit Regrain + * Test/VTKTest*.cxx : remove the show variable in each test method because + it's useless (the viewer variable replace this variable) + 2005-01-25 Benoit Regrain * src/gdcmDocument.cxx : bug fix on potential memory leak * src/gdcmSQItem.cxx : initialize the SQItemNumber value in the constructor diff --git a/Testing/VTKTestRead.cxx b/Testing/VTKTestRead.cxx index 5efa8838..14dbb9ea 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/22 22:51:40 $ - Version: $Revision: 1.6 $ + Date: $Date: 2005/01/25 11:25:32 $ + 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,11 +36,9 @@ int VTKReadTest(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 - (void)show; t->CleanArguments(); t->AddArgument("-D"); @@ -209,7 +207,7 @@ int VTKTestRead(int argc, char *argv[]) } else { - ret = VTKReadTest(t,viewer,argv[1+show],argv[2+show],show); + ret = VTKReadTest(t,viewer,argv[1+show],argv[2+show]); t->Delete(); if( viewer ) viewer->Delete(); @@ -235,7 +233,7 @@ int VTKTestRead(int argc, char *argv[]) pngfile.insert( 0, "Baseline/"); //std::cerr << "PNG file: " << pngfile << std::endl; - ret += VTKReadTest(t,viewer,filename,pngfile,show); + ret += VTKReadTest(t,viewer,filename,pngfile); } t->Delete(); if( viewer ) diff --git a/Testing/VTKTestReadSeq.cxx b/Testing/VTKTestReadSeq.cxx index 77d0c30e..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/20 16:31:42 $ - Version: $Revision: 1.5 $ + 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 @@ -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 ) diff --git a/Testing/VTKTestWrite.cxx b/Testing/VTKTestWrite.cxx index ac1e57c1..c7b6f7a4 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/20 16:31:42 $ - Version: $Revision: 1.5 $ + 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 @@ -37,8 +37,7 @@ int VTKWriteTest(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 @@ -74,7 +73,7 @@ int VTKWriteTest(vtkTesting *t,vtkImageViewer *viewer, reader->GetOutput()->GetDimensions( dim ); // Show - if( show ) + if( viewer ) { viewer->SetInput ( reader->GetOutput() ); @@ -212,7 +211,7 @@ int VTKTestWrite(int argc, char *argv[]) } else { - ret = VTKWriteTest(t,viewer,argv[1+show],argv[2+show],show); + ret = VTKWriteTest(t,viewer,argv[1+show],argv[2+show]); t->Delete(); if( viewer ) viewer->Delete(); @@ -238,7 +237,7 @@ int VTKTestWrite(int argc, char *argv[]) pngfile.insert( 0, "Baseline/"); //std::cerr << "PNG file: " << pngfile << std::endl; - ret += VTKWriteTest(t,viewer,filename,pngfile,show); + ret += VTKWriteTest(t,viewer,filename,pngfile); } t->Delete(); if( viewer ) diff --git a/src/gdcmDocument.cxx b/src/gdcmDocument.cxx index 1acf58f1..ca217bb7 100644 --- a/src/gdcmDocument.cxx +++ b/src/gdcmDocument.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDocument.cxx,v $ Language: C++ - Date: $Date: 2005/01/25 11:11:58 $ - Version: $Revision: 1.208 $ + Date: $Date: 2005/01/25 11:25:33 $ + Version: $Revision: 1.209 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -2896,7 +2896,6 @@ bool Document::operator<(Document &document) return false; } - /** * \brief Re-computes the length of a ACR-NEMA/Dicom group from a DcmHeader * @param filetype Type of the File to be written