X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FTestUtil.cxx;h=f7b2952c3b6bec67c3d29166fd269f28dbfc151e;hb=283cb16bbde7f9a68f240d9a28b018a3f05c746b;hp=ba4fc909b7eb36fc69887fcebb8b70a7dc888983;hpb=c094854320484d68477c1855e3fa619e33db7cec;p=gdcm.git diff --git a/Testing/TestUtil.cxx b/Testing/TestUtil.cxx index ba4fc909..f7b2952c 100644 --- a/Testing/TestUtil.cxx +++ b/Testing/TestUtil.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: TestUtil.cxx,v $ Language: C++ - Date: $Date: 2005/08/19 16:31:06 $ - Version: $Revision: 1.14 $ + Date: $Date: 2007/05/23 14:18:06 $ + Version: $Revision: 1.21 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -30,12 +30,12 @@ int TestUtil(int , char *[]) // are implanted in memory uint16_t u16 = 0x0102; uint32_t u32 = 0x01020304; - float flt= 1.0; + float flt; double dbl=1.0; - std::cout << "This is gdcm version: " << gdcm::GetVersion() << std::endl; + std::cout << "This is gdcm version: " << GDCM_NAME_SPACE::Util::GetVersion() << std::endl; - std::cout << "---------- uint16 : " << std::dec < [" << y <<"]" << std::endl; @@ -96,12 +108,12 @@ int TestUtil(int , char *[]) x = "abcd#@-wyz*@-lmn#@-uvw-#@ijk"; std::cout << "in [" << x << "] " << std::endl; std::cout << " - count '#@-' : " - << gdcm::Util::CountSubstring(x, "#@-") << std::endl; + << GDCM_NAME_SPACE::Util::CountSubstring(x, "#@-") << std::endl; // Tokenize : tokens are '#', '@', '-' std::vector tokens; std::cout << " - use tokens '#@-' :" << std::endl; - gdcm::Util::Tokenize (x, tokens, "#@-"); + GDCM_NAME_SPACE::Util::Tokenize (x, tokens, "#@-"); for (unsigned int ui=0; ui MD5 : " << GDCM_NAME_SPACE::Util::ConvertToMD5(s1) + < MD5 : " << GDCM_NAME_SPACE::Util::ConvertToMD5(s1) + < MD5 : " << GDCM_NAME_SPACE::Util::ConvertToMD5(s1) + < MD5 : " << GDCM_NAME_SPACE::Util::ConvertToMD5(s1) + < MD5 : " << GDCM_NAME_SPACE::Util::ConvertToMD5(s1) + <