ENH: Apply first patch toward better string comparison when dealing with broken DICOM...

[gdcm.git] / Testing / TestCopyDicom.cxx

diff --git a/Testing/TestCopyDicom.cxx b/Testing/TestCopyDicom.cxx
index f5ded1b22abdc9c4853ba11ff975c20ec6253f8a..3689353aa348185eae3cc2f8269ff993caec710e 100644 (file)
--- a/Testing/TestCopyDicom.cxx
+++ b/Testing/TestCopyDicom.cxx
@@ -9,6 +9,8 @@
 
 #ifndef _WIN32
 #include <unistd.h> //for access, unlink
+#else
+#include <io.h> //for _access on Win32
 #endif
 
 // return true if the file exists
@@ -64,10 +66,13 @@ int TestCopyDicom(int , char* [])
          }
       }
 
-      gdcmFile *original = new gdcmFile( filename );
-      gdcmFile *copy = new gdcmFile( output );
+      gdcm::File *original = new gdcm::File( filename );
+      gdcm::File *copy = new gdcm::File( output );
 
-      TagDocEntryHT & Ht = original->GetHeader()->GetEntry(); 
+      const gdcm::TagDocEntryHT & Ht = original->GetHeader()->GetTagHT();
+
+      size_t dataSize = original->GetImageDataSize();
+      uint8_t* imageData = original->GetImageData();
 
       //First of all copy the header field by field
   
@@ -75,56 +80,28 @@ int TestCopyDicom(int , char* [])
       // It was commented out by Mathieu, that was a *good* idea
       // (the user does NOT have to know the way we implemented the Header !)
       // Waiting for a 'clean' solution, I keep the method ...JPRx
-    
-      TagNameHT & nameHt = original->GetHeader()->GetPubDict()->GetEntriesByName();
 
-      gdcmValEntry* v;
-      gdcmBinEntry* b;
-      gdcmDocEntry* d;
+      gdcm::DocEntry* d;
 
-      for (TagDocEntryHT::iterator tag = Ht.begin(); tag != Ht.end(); ++tag)
+      for (gdcm::TagDocEntryHT::const_iterator tag = Ht.begin(); tag != Ht.end(); ++tag)
       {
          d = tag->second;
- 
-         if ( gdcmBinEntry* b = dynamic_cast<gdcmBinEntry*>(d) )
-         { 
-         // for private elements, the gdcmDictEntry is unknown
-         // and it's VR is unpredictable ...
-         // ( In *this* case ReplaceOrCreateByNumber 
-         //  should have a knowledge of the virtual dictionary 
-         //  gdcmDictSet::VirtualEntry ) 
-         // ReplaceOrCreateByNumber may now receive the VR of the source Entry
-         // as a extra parameter
-         //
-            //if ( d->GetGroup()%2 == 1) // Skip private Entries 
-            //   continue;
-
-           // TODO :write ReplaceOrCreateByNumber with VR, 
-           //       for BinEntries as well!
-             
+         if ( gdcm::BinEntry* b = dynamic_cast<gdcm::BinEntry*>(d) )
+         {              
             copy->GetHeader()->ReplaceOrCreateByNumber( 
-                                 b->GetVoidArea(),
+                                 b->GetBinArea(),
                                  b->GetLength(),
                                  b->GetGroup(), 
-                                 b->GetElement() );
-            }
-            else  if ( gdcmValEntry* v = dynamic_cast<gdcmValEntry*>(d) )
-            {
-               if ( d->GetGroup()%2 != 1)
-               {
-                  copy->GetHeader()->ReplaceOrCreateByNumber( 
-                                 v->GetValue(),
-                                 v->GetGroup(), 
-                                 v->GetElement() );
-                }
-                else
-                {
-                  copy->GetHeader()->ReplaceOrCreateByNumber( 
+                                 b->GetElement(),
+                                 b->GetVR() );
+         }
+         else if ( gdcm::ValEntry* v = dynamic_cast<gdcm::ValEntry*>(d) )
+         {   
+             copy->GetHeader()->ReplaceOrCreateByNumber( 
                                  v->GetValue(),
                                  v->GetGroup(), 
                                  v->GetElement(),
                                  v->GetVR() ); 
-                }
          }
          else
          {
@@ -136,9 +113,6 @@ int TestCopyDicom(int , char* [])
          }
       }
 
-      size_t dataSize = original->GetImageDataSize();
-      void *imageData = original->GetImageData();
-
       copy->SetImageData(imageData, dataSize);
       original->GetHeader()->SetImageDataSize(dataSize);
 
@@ -147,7 +121,7 @@ int TestCopyDicom(int , char* [])
       delete original;
       delete copy;
 
-      copy = new gdcmFile( output );
+      copy = new gdcm::File( output );
 
       //Is the file written still gdcm parsable ?
       if ( !copy->GetHeader()->IsReadable() )