diff --git a/CxImage/ximadsp.cpp b/CxImage/ximadsp.cpp
index 68695db..a485ef3 100644
--- a/CxImage/ximadsp.cpp
+++ b/CxImage/ximadsp.cpp
@@ -3504,8 +3504,8 @@ bool CxImage::FloodFill(const long xStart, const long yStart, const RGBQUAD cFil
if (IsIndexed()){ //--- Generic indexed image, no tolerance OR Grayscale image with tolerance
BYTE idxRef = GetPixelIndex(xStart,yStart);
BYTE idxFill = GetNearestIndex(cFillColor);
- BYTE idxMin = (BYTE)min(255, max(0,(int)(idxRef - nTolerance)));
- BYTE idxMax = (BYTE)min(255, max(0,(int)(idxRef + nTolerance)));
+ BYTE idxMin = (BYTE)std::min(255, std::max(0,(int)(idxRef - nTolerance)));
+ BYTE idxMax = (BYTE)std::min(255, std::max(0,(int)(idxRef + nTolerance)));
while(!q.empty())
{
@@ -3541,12 +3541,12 @@ bool CxImage::FloodFill(const long xStart, const long yStart, const RGBQUAD cFil
} else { //--- RGB image
RGBQUAD cRef = GetPixelColor(xStart,yStart);
RGBQUAD cRefMin, cRefMax;
- cRefMin.rgbRed = (BYTE)min(255, max(0,(int)(cRef.rgbRed - nTolerance)));
- cRefMin.rgbGreen = (BYTE)min(255, max(0,(int)(cRef.rgbGreen - nTolerance)));
- cRefMin.rgbBlue = (BYTE)min(255, max(0,(int)(cRef.rgbBlue - nTolerance)));
- cRefMax.rgbRed = (BYTE)min(255, max(0,(int)(cRef.rgbRed + nTolerance)));
- cRefMax.rgbGreen = (BYTE)min(255, max(0,(int)(cRef.rgbGreen + nTolerance)));
- cRefMax.rgbBlue = (BYTE)min(255, max(0,(int)(cRef.rgbBlue + nTolerance)));
+ cRefMin.rgbRed = (BYTE)std::min(255, std::max(0,(int)(cRef.rgbRed - nTolerance)));
+ cRefMin.rgbGreen = (BYTE)std::min(255, std::max(0,(int)(cRef.rgbGreen - nTolerance)));
+ cRefMin.rgbBlue = (BYTE)std::min(255, std::max(0,(int)(cRef.rgbBlue - nTolerance)));
+ cRefMax.rgbRed = (BYTE)std::min(255, std::max(0,(int)(cRef.rgbRed + nTolerance)));
+ cRefMax.rgbGreen = (BYTE)std::min(255, std::max(0,(int)(cRef.rgbGreen + nTolerance)));
+ cRefMax.rgbBlue = (BYTE)std::min(255, std::max(0,(int)(cRef.rgbBlue + nTolerance)));
while(!q.empty())
{