X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmUtil.h;h=f24b0000235393c6275a343d5f2dd8369a08c3fa;hb=fc4f7706c78baf3f60474c06d871b82db221f37b;hp=e1f823e8ccfec7ff95bb066f7157664793a839aa;hpb=8fd45dc6d321d1419854dc0e4fa6a37d6826b655;p=gdcm.git diff --git a/src/gdcmUtil.h b/src/gdcmUtil.h index e1f823e8..f24b0000 100644 --- a/src/gdcmUtil.h +++ b/src/gdcmUtil.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmUtil.h,v $ Language: C++ - Date: $Date: 2007/05/23 14:18:11 $ - Version: $Revision: 1.68 $ + Date: $Date: 2008/01/02 14:58:00 $ + Version: $Revision: 1.72 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -16,8 +16,8 @@ =========================================================================*/ -#ifndef GDCMUTIL_H -#define GDCMUTIL_H +#ifndef _GDCMUTIL_H_ +#define _GDCMUTIL_H_ #include "gdcmCommon.h" #include @@ -47,6 +47,7 @@ public: static std::string CreateCleanString(uint8_t *s, int l); static bool IsCleanString(std::string const &s); static bool IsCleanArea(uint8_t *s, int l); + static void ReplaceSpecChar(std::string &s, std::string &rep); static std::string NormalizePath(std::string const &name); static std::string GetPath(std::string const &fullName); static std::string GetName(std::string const &fullName); @@ -96,7 +97,8 @@ public: *a = *b; *b = tmp; } - void hfpswap(double *a, double *b); + void hfpswap(double *a, double *b); + static inline void sthifpswap(double *a, double *b) { double tmp; @@ -122,8 +124,9 @@ private: static std::string RootUID; static const std::string GDCM_UID; static uint8_t *FileMetaInformationVersion; + static const uint16_t FMIV; - static std::string GDCM_MAC_ADRESS; + static std::string GDCM_MAC_ADDRESS; // For MD5 @@ -149,7 +152,7 @@ private: ghost@aladdin.com */ -/* $Id: gdcmUtil.h,v 1.68 2007/05/23 14:18:11 jpr Exp $ */ +/* $Id: gdcmUtil.h,v 1.72 2008/01/02 14:58:00 malaterre Exp $ */ /* Independent implementation of MD5 (RFC 1321). This code implements the MD5 Algorithm defined in RFC 1321, whose