X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FTestAllReadCompareDicom.cxx;h=d31b1f40cd04fb68f23589a2de8533f90fbff107;hb=922095a0dd56f24d651b36f62256690020937d9a;hp=11a2d7defdd06a7c7022e3ad8e0e8842e4c60832;hpb=c852120fdb6d542d84f74440b68414fdb52178d7;p=gdcm.git

diff --git a/Testing/TestAllReadCompareDicom.cxx b/Testing/TestAllReadCompareDicom.cxx
index 11a2d7de..d31b1f40 100644
--- a/Testing/TestAllReadCompareDicom.cxx
+++ b/Testing/TestAllReadCompareDicom.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: TestAllReadCompareDicom.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/11/24 16:39:18 $
-  Version:   $Revision: 1.18 $
+  Date:      $Date: 2004/12/03 20:43:36 $
+  Version:   $Revision: 1.22 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -17,7 +17,9 @@
 =========================================================================*/
 #include "gdcmHeader.h"
 #include "gdcmFile.h"
-#include <stdio.h>
+
+#include <iostream>
+#include <fstream>
 
 //Generated file:
 #include "gdcmDataImages.h"
@@ -43,18 +45,21 @@ int InternalTest(std::string const & filename,
       ////// Check for existence of reference baseline dicom file:
       std::cout << "2...";
 
-      FILE* testFILE = fopen( referenceFileName.c_str(), "r" );
+      //FILE* testFILE = fopen( referenceFileName.c_str(), "r" );
+      std::ifstream testFILE( referenceFileName.c_str() );
       if (! testFILE )
       {
-         uint8_t* testedImageData = tested->GetImageDataRaw(); // Kludge
+         uint8_t* testedImageData = tested->GetImageData(); // Kludge
          (void)testedImageData;
 
+         tested->SetWriteModeToRGB();
          tested->WriteDcmExplVR( referenceFileName );
       }
       else
       {
-         fclose( testFILE );
+         //fclose( testFILE );
       }
+      testFILE.close();
 
       ////// Step 3a:
       ////// When reference file is not gdcm readable test is failed:
@@ -74,12 +79,31 @@ int InternalTest(std::string const & filename,
 
       ////// Step 3b:
       std::cout << "3b...";
-      int testedDataSize    = tested->GetImageDataSizeRaw();
-      uint8_t* testedImageData = tested->GetImageDataRaw();
+      int testedDataSize    = tested->GetImageDataSize();
+      uint8_t* testedImageData = tested->GetImageData();
     
-      int    referenceDataSize = reference->GetImageDataSizeRaw();
-      uint8_t* referenceImageData = reference->GetImageDataRaw();
+      int    referenceDataSize = reference->GetImageDataSize();
+      uint8_t* referenceImageData = reference->GetImageData();
+
+      // Test the image size
+      if (tested->GetHeader()->GetXSize() != reference->GetHeader()->GetXSize() ||
+          tested->GetHeader()->GetYSize() != reference->GetHeader()->GetYSize() ||
+          tested->GetHeader()->GetZSize() != reference->GetHeader()->GetZSize())
+      {
+         std::cout << "Failed" << std::endl
+            << "        Size differs: "
+            << "X: " << tested->GetHeader()->GetXSize() << " # " 
+                     << reference->GetHeader()->GetXSize() << " | "
+            << "Y: " << tested->GetHeader()->GetYSize() << " # " 
+                     << reference->GetHeader()->GetYSize() << " | "
+            << "Z: " << tested->GetHeader()->GetZSize() << " # " 
+                     << reference->GetHeader()->GetZSize() << std::endl;
+         delete reference;
+         delete tested;
+         return 1;
+      }
 
+      // Test the data size
       if (testedDataSize != referenceDataSize)
       {
          std::cout << " Failed" << std::endl
@@ -91,6 +115,7 @@ int InternalTest(std::string const & filename,
          return 1;
       }
 
+      // Test the data content
       if (int res = memcmp(testedImageData, referenceImageData,
                            testedDataSize) != 0 )
       {