X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=Testing%2FTestChangeHeader.cxx;h=bfdc2ba282b89732c8a7b32dd92d363c78709870;hb=9d461db5c5d954548cd07d1fa095e9bad43a0cac;hp=40893a3faaa8e5814a287a8c84440752974b166b;hpb=be54aab0103af7dee1a3bb5b8b3ee93b59ca9073;p=gdcm.git diff --git a/Testing/TestChangeHeader.cxx b/Testing/TestChangeHeader.cxx index 40893a3f..bfdc2ba2 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/24 16:44:53 $ - Version: $Revision: 1.31 $ + Date: $Date: 2005/07/08 13:39:57 $ + Version: $Revision: 1.35 $ 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) { @@ -31,18 +34,20 @@ int TestChangeHeader(int argc, char* argv[]) return 1; } - std::string premier = argv[1]; - gdcmFile *f1 = new gdcmFile(premier); - - std::string deuxieme = argv[2]; - gdcmFile *f2 = new gdcmFile(deuxieme); + std::string firstArgument = argv[1]; + + gdcm::File *f1 = new gdcm::File(); + f1->SetFileName(firstArgument); + f1->Load( ); + std::string secondArgument = argv[2]; + gdcm::File *f2 = new gdcm::File(secondArgument); //f1->PrintPubElVal(); - // We suppose the DICOM Entries of the second file *do* exist ! + // 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);