X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FTestMakeIcon.cxx;h=e7aa034ce6b626b8019674b3548714d621cd8154;hb=4697271eeddedd62e9a599a32181afac6229dc30;hp=2da82ce370002e9589319f9af66bd4ea9f2bded6;hpb=d4473ebbcf880af0d6dd9c5603929f3bf61b8162;p=gdcm.git diff --git a/Testing/TestMakeIcon.cxx b/Testing/TestMakeIcon.cxx index 2da82ce3..e7aa034c 100644 --- a/Testing/TestMakeIcon.cxx +++ b/Testing/TestMakeIcon.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: TestMakeIcon.cxx,v $ Language: C++ - Date: $Date: 2006/04/11 16:05:03 $ - Version: $Revision: 1.11 $ + Date: $Date: 2007/08/29 15:56:41 $ + Version: $Revision: 1.14 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -35,7 +35,7 @@ int TestMakeIcon (int argc, char *argv[]) std::string output = "testIcon.dcm"; - gdcm::Debug::DebugOn(); + GDCM_NAME_SPACE::Debug::DebugOn(); if ( argc == 3 ) { @@ -48,7 +48,7 @@ int TestMakeIcon (int argc, char *argv[]) << " input filename.dcm output Filename.dcm" << std::endl; } - gdcm::File *f = gdcm::File::New( ); + GDCM_NAME_SPACE::File *f = GDCM_NAME_SPACE::File::New( ); f->SetFileName( input ); f->Load( ); @@ -58,16 +58,16 @@ int TestMakeIcon (int argc, char *argv[]) f->Delete(); return 1; } - gdcm::FileHelper *fh = gdcm::FileHelper::New(f); + GDCM_NAME_SPACE::FileHelper *fh = GDCM_NAME_SPACE::FileHelper::New(f); uint8_t *pixels = fh->GetImageData(); uint32_t lgth = fh->GetImageDataSize(); - gdcm::SeqEntry *icon = f->InsertSeqEntry(0x0088, 0x0200); - gdcm::SQItem *sqi = gdcm::SQItem::New(1); + GDCM_NAME_SPACE::SeqEntry *icon = f->InsertSeqEntry(0x0088, 0x0200); + GDCM_NAME_SPACE::SQItem *sqi = GDCM_NAME_SPACE::SQItem::New(1); icon->AddSQItem(sqi, 1); sqi->Delete(); - // icone is just define like the image + // icone is just defined like the image // The purpose is NOT to imagine an icon, // just check the stuff works @@ -79,8 +79,8 @@ int TestMakeIcon (int argc, char *argv[]) sqi->InsertEntryString( "8", 0x0028,0x0101, "US"); sqi->InsertEntryString( "7", 0x0028,0x0102, "US"); sqi->InsertEntryString( "0", 0x0028,0x0103, "US"); - sqi->InsertEntryBinArea( (uint8_t *)binVal, 3*2, 0x0005,0x0010,"OW"); - sqi->InsertEntryBinArea( pixels, lgth, 0x7fe0,0x0010); + sqi->InsertEntryBinArea( (uint8_t *)binVal, 3*2, 0x0005,0x0010,"OB"); + sqi->InsertEntryBinArea( pixels, lgth, 0x7fe0,0x0010,"OB"); // just to see if it's stored a the right place sqi->InsertEntryString( "128", 0x0028,0x0011, "US"); @@ -89,7 +89,7 @@ int TestMakeIcon (int argc, char *argv[]) f->Delete(); fh->Delete(); - f = gdcm::File::New(); + f = GDCM_NAME_SPACE::File::New(); f->SetFileName(output); f->Load(); f->Print();