X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FTestChangeHeader.cxx;h=dc7919a1e2dc0a891c69ddc8e7791c2985e36222;hb=4552d4ee18f3234af4e037e77abf0622c2702004;hp=7d7723f2548b9e25bde95632c5f5f914987eb1da;hpb=2aa990262ad42625affdb0d6866bb3afe646f965;p=gdcm.git diff --git a/Testing/TestChangeHeader.cxx b/Testing/TestChangeHeader.cxx index 7d7723f2..dc7919a1 100644 --- a/Testing/TestChangeHeader.cxx +++ b/Testing/TestChangeHeader.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: TestChangeHeader.cxx,v $ Language: C++ - Date: $Date: 2005/01/25 15:29:33 $ - Version: $Revision: 1.32 $ + Date: $Date: 2008/09/15 15:49:21 $ + Version: $Revision: 1.36 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -15,14 +15,17 @@ PURPOSE. See the above copyright notices for more information. =========================================================================*/ -#include "gdcmHeader.h" +#include "gdcmFileHelper.h" #include "gdcmFile.h" // Writting of a DICOM file, using a correct gdcmHeader. // and pixels of an other image -int TestChangeHeader(int argc, char* argv[]) +// NO SYNTAX UPDATED +// Doesn't compile ! + +int TestChangeHeader(int argc, char *argv[]) { if (argc < 3) { @@ -32,17 +35,19 @@ int TestChangeHeader(int argc, char* argv[]) } std::string firstArgument = argv[1]; - gdcmFile *f1 = new gdcmFile(firstArgument); - + + GDCM_NAME_SPACE::File *f1 = new GDCM_NAME_SPACE::File(); + f1->SetFileName(firstArgument); + f1->Load( ); std::string secondArgument = argv[2]; - gdcmFile *f2 = new gdcmFile(secondArgument); + GDCM_NAME_SPACE::File *f2 = new GDCM_NAME_SPACE::File(secondArgument); //f1->PrintPubElVal(); // We suppose the DICOM Entries of the second file *does* exist ! std::string nbFrames = f2->GetHeader()->GetEntryValue(0x0028, 0x0008); - if(nbFrames != "gdcm::Unfound") + if(nbFrames != GDCM_UNFOUND) { f1->GetHeader()->Insert( nbFrames, 0x0028, 0x0008); } @@ -77,9 +82,9 @@ int TestChangeHeader(int argc, char* argv[]) int dataSize = f2->GetImageDataSize(); printf ("dataSize %d\n",dataSize); - uint8_t* imageData= f2->GetImageData(); + uint8_t *imageData= f2->GetImageData(); -// TODO : Why don't we merge theese 2 functions ? +// TODO : Why don't we merge these 2 functions ? f1->SetImageData(imageData,dataSize);