X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FVTKTestRead.cxx;h=90f677b61774c8f4194e06768cf018cc7bb046d8;hb=877ca41e984513a592552a8bed79e3bc6416f9f3;hp=89015c9ed48c9c1fb3f552303b137ce4ad4f0975;hpb=3e82e8b67eddf5d4b95b6aa2a2e2615aced4c452;p=gdcm.git

diff --git a/Testing/VTKTestRead.cxx b/Testing/VTKTestRead.cxx
index 89015c9e..90f677b6 100644
--- a/Testing/VTKTestRead.cxx
+++ b/Testing/VTKTestRead.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: VTKTestRead.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/02/02 10:05:26 $
-  Version:   $Revision: 1.9 $
+  Date:      $Date: 2007/09/18 07:58:38 $
+  Version:   $Revision: 1.15 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -15,7 +15,6 @@
      PURPOSE.  See the above copyright notices for more information.
                                                                                 
 =========================================================================*/
-#include "gdcmFileHelper.h"
 #include "vtkGdcmReader.h"
 #include "vtkImageViewer.h"
 #include "vtkImageData.h"
@@ -28,6 +27,7 @@
 #include "vtkPNGWriter.h"
 
 #include <iostream>
+#include <sstream>
 
 //Generated file:
 #include "gdcmDataImages.h"
@@ -40,7 +40,7 @@ int VTKReadTest(vtkTesting *t,vtkImageViewer *viewer,
                 std::string const &filename, 
                 std::string const &referenceFileName)
 {
-   int retVal = 0;  //by default this is an error
+   int retVal; // = 0; (to avoid bcc5.5 warnings)
 
    t->CleanArguments();
    t->AddArgument("-D");
@@ -50,19 +50,8 @@ int VTKReadTest(vtkTesting *t,vtkImageViewer *viewer,
    t->AddArgument("-T");
    t->AddArgument( "." );
    
-   // Instead of directly reading the dicom let's write it down to another file
-   // do a scope to be sure everything gets cleanup
-   {
-      gdcm::FileHelper file( filename );
-      file.GetImageData();
-      file.SetWriteModeToRaw();
-      file.WriteDcmExplVR( "TestWrite.dcm" );
-   }
- 
-   // Ok for now still use the original image, 
    vtkGdcmReader *reader = vtkGdcmReader::New();
-   //reader->SetFileName( filename.c_str() );
-   reader->SetFileName( "TestWrite.dcm" );
+   reader->SetFileName( filename.c_str() );
    reader->Update();
 
    double range[2];
@@ -159,7 +148,7 @@ int VTKReadTest(vtkTesting *t,vtkImageViewer *viewer,
    //----------------------------------------------------------------------
 
    // make test
-   ostrstream str;
+   std::ostringstream str;
    retVal = t->RegressionTest(image,0.0,str);
    image->UnRegister(NULL);
 
@@ -167,7 +156,6 @@ int VTKReadTest(vtkTesting *t,vtkImageViewer *viewer,
    {
       std::cerr << str.str();
    }
-   str.rdbuf()->freeze(1);
 
    if( retVal == vtkTesting::PASSED )
    {
@@ -216,6 +204,8 @@ int VTKTestRead(int argc, char *argv[])
 
       return ret;
    }
+   
+   //gdcm::Debug::DebugOn(); // Comment out when no bug is to be tracked
 
    // Test for all images
    int i = 0;