FIX: Revert back to previous version, I don't believe this was a really safe code...

[gdcm.git] / Testing / TestCopyDicom.cxx

diff --git a/Testing/TestCopyDicom.cxx b/Testing/TestCopyDicom.cxx
index 5b35c48bd57c22bf2cc8dc365f98fa28d81a4b01..1effa9f67b5c87c86fa8188b3fa3a0f03cdc137a 100644 (file)
--- a/Testing/TestCopyDicom.cxx
+++ b/Testing/TestCopyDicom.cxx
@@ -41,7 +41,7 @@ bool RemoveFile(const char* source)
 // Here we load a gdcmFile and then try to create from scratch a copy of it,
 // copying field by field the dicom image
 
-int TestCopyDicom(int argc, char* argv[])
+int TestCopyDicom(int , char* [])
 {
    int i =0;
    int retVal = 0;  //by default this is an error
@@ -67,7 +67,10 @@ int TestCopyDicom(int argc, char* argv[])
       gdcmFile *original = new gdcmFile( filename );
       gdcmFile *copy = new gdcmFile( output );
 
-      TagDocEntryHT & Ht = original->GetHeader()->GetEntry(); 
+      TagDocEntryHT & Ht = original->GetHeader()->GetEntry();
+
+      size_t dataSize = original->GetImageDataSize();
+      uint8_t* imageData = original->GetImageData();
 
       //First of all copy the header field by field
   
@@ -84,33 +87,30 @@ int TestCopyDicom(int argc, char* argv[])
          if ( gdcmBinEntry* b = dynamic_cast<gdcmBinEntry*>(d) )
          {              
             copy->GetHeader()->ReplaceOrCreateByNumber( 
-                                 b->GetVoidArea(),
+                                 b->GetBinArea(),
                                  b->GetLength(),
                                  b->GetGroup(), 
                                  b->GetElement(),
                                  b->GetVR() );
-            }
-            else  if ( gdcmValEntry* v = dynamic_cast<gdcmValEntry*>(d) )
-            {   
-               copy->GetHeader()->ReplaceOrCreateByNumber( 
+         }
+         else if ( gdcmValEntry* v = dynamic_cast<gdcmValEntry*>(d) )
+         {   
+             copy->GetHeader()->ReplaceOrCreateByNumber( 
                                  v->GetValue(),
                                  v->GetGroup(), 
                                  v->GetElement(),
                                  v->GetVR() ); 
-           }
-           else
-           {
+         }
+         else
+         {
           // We skip pb of SQ recursive exploration
           //std::cout << "Skipped Sequence " 
           //          << "------------- " << d->GetVR() << " "<< std::hex
           //          << d->GetGroup() << " " << d->GetElement()
           //  << std::endl;    
-           }
+         }
       }
 
-      size_t dataSize = original->GetImageDataSize();
-      void *imageData = original->GetImageData();
-
       copy->SetImageData(imageData, dataSize);
       original->GetHeader()->SetImageDataSize(dataSize);