ENH: Some fix, plus some cleanup

[gdcm.git] / Testing / TestAllReadCompareDicom.cxx

diff --git a/Testing/TestAllReadCompareDicom.cxx b/Testing/TestAllReadCompareDicom.cxx
index e2474b959ff96f08cc634e17e4f86b5bd08352a9..0c0595c80123b4d4d13039b8459e09182280d3ef 100644 (file)
--- a/Testing/TestAllReadCompareDicom.cxx
+++ b/Testing/TestAllReadCompareDicom.cxx
@@ -53,25 +53,27 @@ int TestAllReadCompareDicom(int argc, char* argv[])
       FILE* testFILE = fopen( baseLineDir.c_str(), "r" );
       if (! testFILE )
       {
-        std::cerr << "   The reference baseline directory " << std::endl
-                  << "      "
-                  << baseLineDir << std::endl
-                  << "   couldn't be opened."
-                  << std::endl;
-        return 1;
+         std::cerr << "   The reference baseline directory " << std::endl
+                   << "      "
+                   << baseLineDir << std::endl
+                   << "   couldn't be opened."
+                   << std::endl;
+         return 1;
       }
       else
-        fclose( testFILE );
+      {
+         fclose( testFILE );
+      }
 
       ////// Step 1 (see above description):
 
       std::string filename = GDCM_DATA_ROOT;
-      filename += "/";  //doh!
+      filename += "/";
       filename += gdcmDataImages[i];
    
       std::cout << "   Testing: " << filename << std::endl;
 
-      gdcmFile* tested = new gdcmFile( filename.c_str(), false, true );
+      gdcmFile* tested = new gdcmFile( filename, false, true );
       if( !tested->GetHeader()->IsReadable() )
       {
         std::cout << "      Image not gdcm compatible:"
@@ -108,7 +110,9 @@ int TestAllReadCompareDicom(int argc, char* argv[])
          continue; 
       }
       else
+      {
          fclose( testFILE );
+      }
 
       ////// When reference file is not gdcm readable test is failed: