X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FTestValidate.cxx;h=b74cb6832c6df7fc028fb47d13b592e2141e6fb1;hb=3406c4fd40fed23d938a1c72d985417ce46c3bc0;hp=835d0ec9019f180b6141bde88175d3b41c64d80c;hpb=cea4eda6efb799edd86f2a4cc61896796406a0fa;p=gdcm.git diff --git a/Testing/TestValidate.cxx b/Testing/TestValidate.cxx index 835d0ec9..b74cb683 100644 --- a/Testing/TestValidate.cxx +++ b/Testing/TestValidate.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: TestValidate.cxx,v $ Language: C++ - Date: $Date: 2005/11/04 17:05:49 $ - Version: $Revision: 1.4 $ + Date: $Date: 2005/11/18 11:10:04 $ + Version: $Revision: 1.9 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -18,6 +18,9 @@ #include "gdcmFile.h" #include "gdcmValidator.h" +#include "gdcmGlobal.h" +#include "gdcmDictSet.h" + //Generated file: #include "gdcmDataImages.h" @@ -28,8 +31,10 @@ int Validate(std::string const &filename) gdcm::File *input = gdcm::File::New( ); input->SetFileName(filename); input->Load(); - gdcm::Validator *v = new gdcm::Validator(); + gdcm::Validator *v = gdcm::Validator::New(); v->SetInput( input ); + input->Delete(); + v->Delete(); return 1; // allways true (we don't want to break the test suite) } @@ -51,10 +56,11 @@ int TestValidate(int argc, char *argv[]) << " filename.dcm " << std::endl; return 1; } - + // Try to track the "FIXME" problem for VM + gdcm::Global::GetDicts()->GetDefaultPubDict()->Print(); int i =0; - int retVal = 0; //by default this is an error + int retVal = 0; //by default : *no* error while( gdcmDataImages[i] != 0 ) { std::string filename = GDCM_DATA_ROOT; @@ -68,6 +74,7 @@ int TestValidate(int argc, char *argv[]) i++; } - return 0; // never break the testsuite! + retVal = 0; // Never break test suite + return retVal; }