X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FTestCopyDicom.cxx;h=62e1a727e9a1a68e0c51a0520786bcdf13132076;hb=f6fd616782f9811f1390c64c9a3e7beb50ca4a04;hp=bd914c68a9a54ce02d16ab50f358831efec6deed;hpb=0a8894522fde1e35128022e0df3f0366677be59e;p=gdcm.git

diff --git a/Testing/TestCopyDicom.cxx b/Testing/TestCopyDicom.cxx
index bd914c68..62e1a727 100644
--- 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
@@ -67,7 +69,10 @@ int TestCopyDicom(int , char* [])
       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
   
@@ -75,46 +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;
 
       for (TagDocEntryHT::iterator tag = Ht.begin(); tag != Ht.end(); ++tag)
       {
          d = tag->second;
-         // 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)
- 
-         if ( d->GetGroup()%2 == 1) // Skip private Entries 
-            continue;
- 
          if ( gdcmBinEntry* b = dynamic_cast<gdcmBinEntry*>(d) )
-         { 
- 
-           // std::cout << "BinEntry : " 
-           //           << "------------- " << b->GetVR() << " "<< std::hex
-           //           << b->GetGroup() << " " << b->GetElement() << " "
-           //           << " lg=" << b->GetLength()
-           //           << std::endl; 
-             
+         {              
             copy->GetHeader()->ReplaceOrCreateByNumber( 
-                                 b->GetVoidArea(),
+                                 b->GetBinArea(),
                                  b->GetLength(),
                                  b->GetGroup(), 
-                                 b->GetElement() );
-            }
-           else  if ( gdcmValEntry* v = dynamic_cast<gdcmValEntry*>(d) )
-            {
-            copy->GetHeader()->ReplaceOrCreateByNumber( 
+                                 b->GetElement(),
+                                 b->GetVR() );
+         }
+         else if ( gdcmValEntry* v = dynamic_cast<gdcmValEntry*>(d) )
+         {   
+             copy->GetHeader()->ReplaceOrCreateByNumber( 
                                  v->GetValue(),
                                  v->GetGroup(), 
-                                 v->GetElement() );
+                                 v->GetElement(),
+                                 v->GetVR() ); 
          }
          else
          {
@@ -126,9 +113,6 @@ int TestCopyDicom(int , char* [])
          }
       }
 
-      size_t dataSize = original->GetImageDataSize();
-      void *imageData = original->GetImageData();
-
       copy->SetImageData(imageData, dataSize);
       original->GetHeader()->SetImageDataSize(dataSize);