X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FTestCopyDicom.cxx;h=1effa9f67b5c87c86fa8188b3fa3a0f03cdc137a;hb=0328b825e66dd367845c51cb7aaf0e1d94607bdb;hp=74075fe7a2e6a11c52fd640e4fd3b31e2dc9668b;hpb=d7637fa58050f4cc346b5356a960e03e58e99dd3;p=gdcm.git diff --git a/Testing/TestCopyDicom.cxx b/Testing/TestCopyDicom.cxx index 74075fe7..1effa9f6 100644 --- a/Testing/TestCopyDicom.cxx +++ b/Testing/TestCopyDicom.cxx @@ -67,7 +67,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 @@ -84,33 +87,30 @@ int TestCopyDicom(int , char* []) if ( gdcmBinEntry* b = dynamic_cast(d) ) { copy->GetHeader()->ReplaceOrCreateByNumber( - b->GetVoidArea(), + b->GetBinArea(), b->GetLength(), b->GetGroup(), b->GetElement(), b->GetVR() ); - } - else if ( gdcmValEntry* v = dynamic_cast(d) ) - { - copy->GetHeader()->ReplaceOrCreateByNumber( + } + else if ( gdcmValEntry* v = dynamic_cast(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);