# HG changeset patch # User jodogne # Date 1347878095 -7200 # Node ID aa65ced5f0f06bac8fb3edfebc55718d2bb9787e # Parent fce53dabac6d7076aca2e5d85d59a60e1da776f4 fix for visual studio diff -r fce53dabac6d -r aa65ced5f0f0 OrthancServer/FromDcmtkBridge.cpp --- a/OrthancServer/FromDcmtkBridge.cpp Sun Sep 16 10:01:36 2012 +0200 +++ b/OrthancServer/FromDcmtkBridge.cpp Mon Sep 17 12:34:55 2012 +0200 @@ -17,6 +17,9 @@ * along with this program. If not, see . **/ +#ifndef NOMINMAX +#define NOMINMAX +#endif #include "FromDcmtkBridge.h" @@ -27,6 +30,8 @@ #include "../Core/DicomFormat/DicomString.h" #include "../Core/DicomFormat/DicomNullValue.h" +#include + #include #include @@ -422,7 +427,7 @@ for (unsigned int x = 0; x < accessor.GetWidth(); x++, pixel++) { int32_t v = accessor.GetValue(x, y); - if (v < std::numeric_limits::min()) + if (v < typename std::numeric_limits::min()) *pixel = std::numeric_limits::min(); else if (v > std::numeric_limits::max()) *pixel = std::numeric_limits::max();