Project

General

Profile

Bug #389 » 0001-Minor-fixes-required-for-compiling-via-mingw.patch

Jan Schlamelcher, 2013-08-04 15:28

View differences:

CMake/3rdparty.cmake
IF(WIN32)
IF(WIN32 AND NOT MINGW)
# For Windows, we don't used FIND_PACKAGE because DCMTK usually is used with its
# own set of 3rd-party support libraries that can be downloaded from DCMTK's
......
ENDIF(WITH_LIBICONVINC)
ENDIF(DCMTK_WITH_ICONV)
ELSE(WIN32)
ELSE(WIN32 AND NOT MINGW)
# Find TIFF
IF(DCMTK_WITH_TIFF)
......
ENDIF(NOT WRAP_LIBS)
ENDIF(DCMTK_WITH_WRAP)
ENDIF(WIN32)
ENDIF(WIN32 AND NOT MINGW)
# Find doxygen
IF(DCMTK_WITH_DOXYGEN)
dcmimage/libsrc/diqtfs.cc
for (unsigned long col = 0; col < columns + 2; ++col)
{
#ifndef rand_r
thisrerr[col] = OFStandard::rand_r(now) % ( DcmQuantFloydSteinbergScale * 2 ) - DcmQuantFloydSteinbergScale;
thisgerr[col] = OFStandard::rand_r(now) % ( DcmQuantFloydSteinbergScale * 2 ) - DcmQuantFloydSteinbergScale;
thisberr[col] = OFStandard::rand_r(now) % ( DcmQuantFloydSteinbergScale * 2 ) - DcmQuantFloydSteinbergScale;
#else
thisrerr[col] = rand_r(now) % ( DcmQuantFloydSteinbergScale * 2 ) - DcmQuantFloydSteinbergScale;
thisgerr[col] = rand_r(now) % ( DcmQuantFloydSteinbergScale * 2 ) - DcmQuantFloydSteinbergScale;
thisberr[col] = rand_r(now) % ( DcmQuantFloydSteinbergScale * 2 ) - DcmQuantFloydSteinbergScale;
#endif
/* (random errors in [-1 .. 1]) */
}
fs_direction = 1;
oflog/libsrc/strcloc.cc
}
STD_NAMESPACE string
OFString
tostring (const STD_NAMESPACE wstring & src)
{
STD_NAMESPACE string ret;
tostring_internal (ret, src.c_str (), src.size ());
return ret;
return ret.c_str();
}
STD_NAMESPACE string
OFString
tostring (wchar_t const * src)
{
assert (src);
STD_NAMESPACE string ret;
tostring_internal (ret, src, wcslen (src));
return ret;
return ret.c_str();
}
ofstd/include/dcmtk/ofstd/offile.h
#endif
#endif
#if defined(_WIN32) && !defined(__MINGW32__)
#if defined(_WIN32) && (!defined(__MINGW32__) || defined(__MINGW64__))
// On Win32 systems except MinGW (where Posix definitions are available)
// we use Win32 specific definitions
typedef __int64 offile_off_t;
ofstd/include/dcmtk/ofstd/ofstd.h
* @param seed pointer to seed of random number generator, must not be NULL.
* @return pseudo-random number in the range of 0 to myrandr_max.
*/
#ifndef rand_r
static int rand_r(unsigned int &seed);
#endif
/// maximum value that can be returned by rand_r()
static const unsigned int rand_max;
ofstd/libsrc/offname.cc
}
if (prefix) filename += prefix;
addLongToString(creation_time, filename);
#ifndef rand_r
addLongToString(((OFStandard::rand_r(seed) << 16) | OFStandard::rand_r(seed)), filename);
#else
addLongToString(((rand_r(seed) << 16) | rand_r(seed)), filename);
#endif
if (postfix) filename += postfix;
// check if filename exists
ofstd/libsrc/ofstd.cc
const unsigned int OFStandard::rand_max = 0x7fffffff;
#ifndef rand_r
int OFStandard::rand_r(unsigned int &seed)
{
unsigned long val = OFstatic_cast(unsigned long, seed);
......
seed = OFstatic_cast(unsigned int, val %(OFstatic_cast(unsigned long, 0x80000000)));
return OFstatic_cast(int, seed);
}
#endif
#define MAX_NAME 65536
(2-2/2)