X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FTestValidate.cxx;h=ebe4a32e109092c9211cf0688a03d6ae396bfbb1;hb=265bddfbec91cd0509d02534a781dddf8371bb63;hp=835d0ec9019f180b6141bde88175d3b41c64d80c;hpb=cea4eda6efb799edd86f2a4cc61896796406a0fa;p=gdcm.git

diff --git a/Testing/TestValidate.cxx b/Testing/TestValidate.cxx
index 835d0ec9..ebe4a32e 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: 2007/06/21 14:59:06 $
+  Version:   $Revision: 1.11 $
                                                                                 
   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"
 
@@ -25,11 +28,13 @@ int Validate(std::string const &filename);
 
 int Validate(std::string const &filename)
 {
-   gdcm::File *input =  gdcm::File::New( );
+   GDCM_NAME_SPACE::File *input =  GDCM_NAME_SPACE::File::New( );
    input->SetFileName(filename);
    input->Load();
-   gdcm::Validator *v = new gdcm::Validator();
+   GDCM_NAME_SPACE::Validator *v = GDCM_NAME_SPACE::Validator::New();
    v->SetInput( input );
+   input->Delete();
+   v->Delete();
    return 1; // allways true (we don't want to break the test suite)
 } 
 
@@ -52,9 +57,8 @@ int TestValidate(int argc, char *argv[])
       return 1;
    }
    
-
    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 +72,7 @@ int TestValidate(int argc, char *argv[])
 
       i++;
    }
-   return 0; // never break the testsuite!
+   retVal = 0; // Never break test suite
+   return retVal;
 }