X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FTestLoadAllDocumentsNoPrivNoSeq.cxx;h=8fa5711b2d31ae50cef027f300ce0fd67a5da023;hb=1e66f7398c38a3d71b480e0297e29636ea6e1c1b;hp=1ebb32ba3ab964103b68f2ff25a54f83a20467dd;hpb=c0c5bfb957dea6d15ee118636fa61aa0ef3dce31;p=gdcm.git

diff --git a/Testing/TestLoadAllDocumentsNoPrivNoSeq.cxx b/Testing/TestLoadAllDocumentsNoPrivNoSeq.cxx
index 1ebb32ba..8fa5711b 100644
--- a/Testing/TestLoadAllDocumentsNoPrivNoSeq.cxx
+++ b/Testing/TestLoadAllDocumentsNoPrivNoSeq.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: TestLoadAllDocumentsNoPrivNoSeq.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/09/22 08:41:27 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2007/06/21 14:59:06 $
+  Version:   $Revision: 1.5 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -24,15 +24,14 @@
 #include "gdcmFile.h"
 #include "gdcmUtil.h"
 #include "gdcmCommon.h"
-#include "gdcmBinEntry.h"  
 #include "gdcmDocEntry.h" 
 #include "gdcmDocEntrySet.h"           
 #include "gdcmDocument.h"          
 #include "gdcmElementSet.h"        
 #include "gdcmSeqEntry.h" 
 #include "gdcmSQItem.h" 
-#include "gdcmValEntry.h" 
 #include "gdcmOrientation.h"
+
 #include <fstream>
 #include <iostream>
 #include <iomanip> // for std::ios::left, ...
@@ -47,18 +46,18 @@ int TestLoadAllDocumentsNoPrivNoSeq(int, char *[])
    //int swapC;
    //unsigned int j;
    std::string pixelType, photomInterp;
-   int l;
-   l = strlen("PALETTE COLOR ");
+   //int l;
+   //l = strlen("PALETTE COLOR ");
    while( gdcmDataImages[i] != 0 )
    {
       std::string filename = GDCM_DATA_ROOT;
       filename += "/";  //doh!
       filename += gdcmDataImages[i];
 
-      gdcm::File *f= new gdcm::File( );
+      GDCM_NAME_SPACE::File *f= GDCM_NAME_SPACE::File::New( );
       f->SetFileName( filename );
       // just to improve coverage
-      f->SetLoadMode (gdcm::LD_NOSEQ|gdcm::LD_NOSHADOW);
+      f->SetLoadMode (GDCM_NAME_SPACE::LD_NOSEQ|GDCM_NAME_SPACE::LD_NOSHADOW);
       f->Load();
 
 /*
@@ -121,11 +120,11 @@ int TestLoadAllDocumentsNoPrivNoSeq(int, char *[])
       {
          std::cout << filename << " is NOT Readable" 
                    << std::endl << std::endl;
-         delete f;
+         f->Delete();
          return 1;
       }
  */
-      delete f;
+      f->Delete();
       i++;
    }
    return 0;