Program: gdcm
Module: $RCSfile: gdcmUtil.cxx,v $
Language: C++
- Date: $Date: 2005/01/22 22:56:22 $
- Version: $Revision: 1.120 $
+ Date: $Date: 2005/01/23 10:12:34 $
+ Version: $Revision: 1.122 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include <sys/types.h>
#include <sys/stat.h>
-#ifdef _MSC_VER
+#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__MINGW32__)
#include <sys/timeb.h>
#else
#include <sys/time.h>
{
char tmp[40];
long milliseconds;
- time_t *timep;
+ time_t timep;
// We need implementation specific functions to obtain millisecond precision
#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__MINGW32__)
struct timeb tb;
::ftime(&tb);
- timep = &tb.time;
+ timep = tb.time;
milliseconds = tb.millitm;
#else
struct timeval tv;
gettimeofday (&tv, NULL);
- timep = (time_t*)(&tv.tv_sec);
+ timep = tv.tv_sec;
// Compute milliseconds from microseconds.
milliseconds = tv.tv_usec / 1000;
#endif
// Obtain the time of day, and convert it to a tm struct.
- struct tm *ptm = localtime (timep);
+ struct tm *ptm = localtime (&timep);
// Format the date and time, down to a single second.
strftime (tmp, sizeof (tmp), "%Y%m%d%H%M%S", ptm);
/**
* \brief Create a /DICOM/ string:
- * It should a of even lenght (no odd length ever)
+ * It should a of even length (no odd length ever)
* It can contain as many (if you are reading this from your
* editor the following character is is backslash followed by zero
* that needed to be escaped with an extra backslash for doxygen) \\0
* as you want.
* This function is similar to DicomString(const char*),
- * except it doesn't take a lenght.
+ * except it doesn't take a length.
* It only pad with a null character if length is odd
*/
std::string Util::DicomString(const char *s)
/**
* \brief Safely compare two Dicom String:
- * - Both string should be of even lenght
- * - We allow padding of even lenght string by either a null
+ * - Both string should be of even length
+ * - We allow padding of even length string by either a null
* character of a space
*/
bool Util::DicomStringEqual(const std::string &s1, const char *s2)