X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmUtil.cxx;h=9d121654eb6bc22c389de5b7d03bcd1c122574c6;hb=c4eae790a08d862201d509f1224409358562b5f0;hp=a23739c220095564c572108bf124f824f2801138;hpb=38af2f6a998968a49176216d2ec283f9f7bc69a0;p=gdcm.git diff --git a/src/gdcmUtil.cxx b/src/gdcmUtil.cxx index a23739c2..9d121654 100644 --- a/src/gdcmUtil.cxx +++ b/src/gdcmUtil.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmUtil.cxx,v $ Language: C++ - Date: $Date: 2005/01/17 21:41:48 $ - Version: $Revision: 1.107 $ + Date: $Date: 2005/01/18 16:19:57 $ + Version: $Revision: 1.112 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -28,7 +28,7 @@ #include //only included in implementation file #include //only included in implementation file -#if defined(_MSC_VER) +#if defined(_MSC_VER) || defined(__MINGW32__) #include // for gethostname & gethostbyname #undef GetCurrentTime #else @@ -49,11 +49,6 @@ #include #endif -// How do I do that in CMake ? -#ifdef __APPLE__ - #define HAVE_SA_LEN -#endif //APPLE - #ifdef CMAKE_HAVE_SYS_IOCTL_H #include // For SIOCGIFCONF on Linux #endif @@ -80,7 +75,6 @@ namespace gdcm { /** - * \ingroup Globals * \brief Provide a better 'c++' approach for sprintf * For example c code is: * sprintf(trash, "%04x|%04x", group , elem); @@ -110,7 +104,6 @@ std::string Util::Format(const char *format, ...) /** - * \ingroup Globals * \brief Because not available in C++ (?) */ void Util::Tokenize (const std::string &str, @@ -128,7 +121,6 @@ void Util::Tokenize (const std::string &str, } /** - * \ingroup Globals * \brief Because not available in C++ (?) * Counts the number of occurences of a substring within a string */ @@ -154,7 +146,6 @@ int Util::CountSubstring (const std::string &str, } /** - * \ingroup Globals * \brief Weed out a string from the non-printable characters (in order * to avoid corrupting the terminal of invocation when printing) * @param s string to remove non printable characters from @@ -186,7 +177,6 @@ std::string Util::CreateCleanString(std::string const &s) } /** - * \ingroup Globals * \brief Add a SEPARATOR to the end of the name is necessary * @param pathname file/directory name to normalize */ @@ -206,7 +196,6 @@ std::string Util::NormalizePath(std::string const &pathname) } /** - * \ingroup Globals * \brief Get the (directory) path from a full path file name * @param fullName file/directory name to extract Path from */ @@ -228,7 +217,6 @@ std::string Util::GetPath(std::string const &fullName) } /** - * \ingroup Util * \brief Get the (last) name of a full path file name * @param fullName file/directory name to extract end name from */ @@ -250,7 +238,6 @@ std::string Util::GetName(std::string const &fullName) } /** - * \ingroup Util * \brief Get the current date of the system in a dicom string */ std::string Util::GetCurrentDate() @@ -263,7 +250,6 @@ std::string Util::GetCurrentDate() } /** - * \ingroup Util * \brief Get the current time of the system in a dicom string */ std::string Util::GetCurrentTime() @@ -291,7 +277,6 @@ std::string Util::DicomString(const char *s, size_t l) } /** - * \ingroup Util * \brief Create a /DICOM/ string: * It should a of even lenght (no odd length ever) * It can contain as many (if you are reading this from your @@ -315,7 +300,6 @@ std::string Util::DicomString(const char *s) } /** - * \ingroup Util * \brief Safely compare two Dicom String: * - Both string should be of even lenght * - We allow padding of even lenght string by either a null @@ -336,7 +320,6 @@ bool Util::DicomStringEqual(const std::string &s1, const char *s2) /** - * \ingroup Util * \brief tells us if the processor we are working with is BigEndian or not */ bool Util::IsCurrentProcessorBigEndian() @@ -513,13 +496,10 @@ int GetMacAddrSys ( unsigned char *addr ) #ifdef __sun //The POSIX version is broken anyway on Solaris, plus would require full //root power - int i; struct arpreq parpreq; - struct sockaddr_in sa, *psa; - struct in_addr inaddr; + struct sockaddr_in *psa; struct hostent *phost; char hostname[MAXHOSTNAMELEN]; - unsigned char *ptr; char **paddrs; int sock, status=0; @@ -561,7 +541,7 @@ int GetMacAddrSys ( unsigned char *addr ) char buf[1024]; int n, i; unsigned char *a; -#if defined(AF_LINK) && !(defined(SIOCGIFHWADDR) || !defined(SIOCGENADDR)) +#if defined(AF_LINK) && (!defined(SIOCGIFHWADDR) && !defined(SIOCGENADDR)) struct sockaddr_dl *sdlp; #endif @@ -644,6 +624,9 @@ int GetMacAddrSys ( unsigned char *addr ) #endif //__sun } +/** + * \brief Gets the M.A.C. adress of the machine writting the DICOM image + */ std::string Util::GetMACAddress() { // This code is the result of a long internet search to find something @@ -673,7 +656,6 @@ std::string Util::GetMACAddress() } /** - * \ingroup Util * \brief Return the IP adress of the machine writting the DICOM image */ std::string Util::GetIPAddress() @@ -687,7 +669,7 @@ std::string Util::GetIPAddress() # define HOST_NAME_MAX 255 // In this case we should maybe check the string was not truncated. // But I don't known how to check that... -#if defined(_MSC_VER) || defined(__BORLANDC__) +#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__MINGW32__) // with WinSock DLL we need to initialise the WinSock before using gethostname WORD wVersionRequested = MAKEWORD(1,0); WSADATA WSAData; @@ -723,7 +705,7 @@ std::string Util::GetIPAddress() } // str now contains one local IP address -#if defined(_MSC_VER) || defined(__BORLANDC__) +#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__MINGW32__) WSACleanup(); #endif @@ -735,7 +717,6 @@ std::string Util::GetIPAddress() } /** - * \ingroup Util * \brief Creates a new UID. As stipulate in the DICOM ref * each time a DICOM image is create it should have * a unique identifier (URI) @@ -761,12 +742,22 @@ std::string Util::CreateUniqueUID(const std::string &root) return radical; } +/** + * \brief + * @param os ostream to write to + * @param val val + */ template std::ostream &binary_write(std::ostream &os, const T &val) { return os.write(reinterpret_cast(&val), sizeof val); } +/** + * \brief binary_write binary_write + * @param os ostream to write to + * @param val val + */ std::ostream &binary_write(std::ostream &os, const uint16_t &val) { #ifdef GDCM_WORDS_BIGENDIAN @@ -778,6 +769,11 @@ std::ostream &binary_write(std::ostream &os, const uint16_t &val) #endif //GDCM_WORDS_BIGENDIAN } +/** + * \brief binary_write binary_write + * @param os ostream to write to + * @param val val + */ std::ostream &binary_write(std::ostream &os, const uint32_t &val) { #ifdef GDCM_WORDS_BIGENDIAN @@ -790,11 +786,21 @@ std::ostream &binary_write(std::ostream &os, const uint32_t &val) #endif //GDCM_WORDS_BIGENDIAN } +/** + * \brief binary_write binary_write + * @param os ostream to write to + * @param val val + */ std::ostream &binary_write(std::ostream &os, const char *val) { return os.write(val, strlen(val)); } +/** + * \brief + * @param os ostream to write to + * @param val val + */ std::ostream &binary_write(std::ostream &os, std::string const &val) { return os.write(val.c_str(), val.size());