Save some CPU time, when parsing ACR-NAMA files :

[gdcm.git] / Testing / TestAllReadCompareDicom.cxx

diff --git a/Testing/TestAllReadCompareDicom.cxx b/Testing/TestAllReadCompareDicom.cxx
index 353c567efd6d4731eebac6c337f2a95b0ab397de..53afc93357638381ad9a636c14e2099b4f86488b 100644 (file)
--- a/Testing/TestAllReadCompareDicom.cxx
+++ b/Testing/TestAllReadCompareDicom.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: TestAllReadCompareDicom.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/07/11 08:50:48 $
-  Version:   $Revision: 1.45 $
+  Date:      $Date: 2005/10/25 14:52:30 $
+  Version:   $Revision: 1.49 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -398,8 +398,8 @@ int InternalTest(std::string const &filename,
       std::cout << "1...";
 
        // new style 
-      gdcm::File *f = new gdcm::File();
-      f->SetLoadMode ( 0x00000000 ); // Load everything
+      gdcm::File *f = gdcm::File::New();
+      f->SetLoadMode ( gdcm::LD_ALL ); // Load everything
       f->SetFileName( filename );
       f->Load();
  
@@ -408,10 +408,10 @@ int InternalTest(std::string const &filename,
         std::cout << " Failed" << std::endl
                    << "      Image not gdcm compatible:"
                   << filename << std::endl;
-        delete f;
+        f->Delete();
         return 1;
       }
-     gdcm::FileHelper *tested = new gdcm::FileHelper( f );
+      gdcm::FileHelper *tested = gdcm::FileHelper::New( f );
      
       ////// Step 2:
       ////// Check for existence of reference baseline dicom file:
@@ -443,8 +443,8 @@ int InternalTest(std::string const &filename,
                    << "      Image not Testing compatible:"
                   << filename << std::endl;
          delete reference;
-         delete tested;
-         delete f;
+         tested->Delete();
+         f->Delete();
          return 1;
       }
 
@@ -471,8 +471,8 @@ int InternalTest(std::string const &filename,
                    << "Z: " << tested->GetFile()->GetZSize() << " # " 
                    << reference->GetZSize() << std::endl;
          delete reference;
-         delete tested;
-         delete f;
+         tested->Delete();
+         f->Delete();
          return 1;
       }
 
@@ -485,10 +485,12 @@ int InternalTest(std::string const &filename,
                    << "        Scalar size: " << tested->GetFile()->GetPixelSize() << " # " 
                    << reference->GetScalarSize() << std::endl
                    << "        Number of scalar: " << tested->GetFile()->GetNumberOfScalarComponents() << " # " 
-                   << reference->GetNumberOfComponents() << std::endl;
+                   << reference->GetNumberOfComponents() << std::endl
+                   << "        Pixel type: " << tested->GetFile()->GetPixelType() << std::endl;
          delete reference;
-         delete tested;
-         delete f;
+         tested->Delete();
+         f->Delete();
+         return 1;
       }
 
       // Test the data size
@@ -505,9 +507,9 @@ int InternalTest(std::string const &filename,
                    << tested->GetFile()->GetYSize() << ","
                    << tested->GetFile()->GetZSize() << ")"
                    << std::endl;
-         delete tested;
+         tested->Delete();
          delete reference;
-         delete f;
+         f->Delete();
          return 1;
       }
 
@@ -544,16 +546,16 @@ int InternalTest(std::string const &filename,
          }
          std::cout << std::endl;
 
-         delete tested;
+         tested->Delete();
          delete reference;
-         delete f;
+         f->Delete();
          return 1;
       }
 
       //////////////// Clean up:
-      delete tested;
+      tested->Delete();
       delete reference;
-      delete f;
+      f->Delete();
 
       std::cout << "OK." << std::endl;