* src/gdcmFile.cxx : now delete the PixelConvert instance.

[gdcm.git] / Example / TestReadWriteReadCompare.cxx

diff --git a/Example/TestReadWriteReadCompare.cxx b/Example/TestReadWriteReadCompare.cxx
index 3732918a9882f83d04fa065881b642834c14d030..9ef3f67a17892b2e83b115410a7f294160f006c1 100644 (file)
--- a/Example/TestReadWriteReadCompare.cxx
+++ b/Example/TestReadWriteReadCompare.cxx
@@ -40,7 +40,7 @@ int main(int argc, char* argv[])
 
       //////////////// Step 1 (see above description): 
 
-      gdcmHeader *header = new gdcmHeader( filename );
+      gdcm::Header *header = new gdcm::Header( filename );
       if( !header->IsReadable() )
       {
          std::cerr << "Test::TestReadWriteReadCompare: Image not gdcm compatible:"
@@ -52,7 +52,7 @@ int main(int argc, char* argv[])
 
       //////////////// Step 2:
 
-      gdcmFile*  file = new gdcmFile( header );
+      gdcm::File*  file = new gdcm::File( header );
       int dataSize    = file->GetImageDataSize();
       uint8_t* imageData = file->GetImageData(); //EXTREMELY IMPORTANT
              // Sure, it is : It's up to the user to decide if he wants to
@@ -82,7 +82,7 @@ int main(int argc, char* argv[])
     
       //////////////// Step 3:
 
-      gdcmFile* reread = new gdcmFile( "TestReadWriteReadCompare.dcm" );
+      gdcm::File* reread = new gdcm::File( "TestReadWriteReadCompare.dcm" );
       if( !reread->GetHeader()->IsReadable() )
       {
         std::cerr << "Test::TestReadWriteReadCompare: Could not reread image "
@@ -95,7 +95,7 @@ int main(int argc, char* argv[])
       std::cout << "3...";
       // For the next step:
       int    dataSizeWritten = reread->GetImageDataSize();
-      void* imageDataWritten = reread->GetImageData();
+      uint8_t* imageDataWritten = reread->GetImageData();
 
       //////////////// Step 4:
  
@@ -104,8 +104,6 @@ int main(int argc, char* argv[])
          std::cout << std::endl
             << "        Pixel areas lengths differ: "
             << dataSize << " # " << dataSizeWritten << std::endl;
-         delete (char*)imageData;
-         delete (char*)imageDataWritten;
          delete header;
          delete file;
          delete reread;
@@ -117,8 +115,6 @@ int main(int argc, char* argv[])
          (void)res;
          std::cout << std::endl
             << "        Pixel differ (as expanded in memory)." << std::endl;
-         delete (char*)imageData;
-         delete (char*)imageDataWritten;
          delete header;
          delete file;
          delete reread;
@@ -127,8 +123,6 @@ int main(int argc, char* argv[])
       std::cout << "4...OK." << std::endl ;
 
       //////////////// Clean up:
-      delete (char*)imageData;
-      delete (char*)imageDataWritten;
       delete header;
       delete file;
       delete reread;