More std::min/max/clamp.

lordnn · lordnn · commit cb3a5bec0882 · 2026-03-22T22:34:35.000+03:00
diff --git a/Source/FreeImage/BitmapAccess.cpp b/Source/FreeImage/BitmapAccess.cpp
@@ -1023,7 +1023,7 @@ FreeImage_GetTransparencyCount(FIBITMAP *dib) {
 void DLL_CALLCONV
 FreeImage_SetTransparencyTable(FIBITMAP *dib, uint8_t *table, int count) {
 	if (dib) {
-		count = MAX(0, MIN(count, 256));
+		count = std::clamp(count, 0, 256);
 		if (FreeImage_GetBPP(dib) <= 8) {
 			((FREEIMAGEHEADER *)dib->data)->transparent = (count > 0) ? TRUE : FALSE;
 			((FREEIMAGEHEADER *)dib->data)->transparency_count = count;
diff --git a/Source/FreeImage/Conversion.cpp b/Source/FreeImage/Conversion.cpp
@@ -123,9 +123,9 @@ CMYKToRGB(T C, T M, T Y, T K, T* out) {
 	unsigned b = (max_val - Y) * (max_val - K) / max_val;
 
 	// clamp values to [0..max_val]
-	T red	= (T)CLAMP(r, (unsigned)0, max_val);
-	T green	= (T)CLAMP(g, (unsigned)0, max_val);
-	T blue	= (T)CLAMP(b, (unsigned)0, max_val);
+	T red	= (T)std::clamp(r, (unsigned)0, max_val);
+	T green	= (T)std::clamp(g, (unsigned)0, max_val);
+	T blue	= (T)std::clamp(b, (unsigned)0, max_val);
 
 	assignRGB(red, green, blue, out);
 }
@@ -276,9 +276,9 @@ CIELabToRGB(float L, float a, float b, T *rgb) {
 	XYZToRGB(X, Y, Z, &R, &G, &B);
 	
 	// clamp values to [0..max_val]
-	T red	= (T)CLAMP(R * max_val, 0.0F, max_val);
-	T green	= (T)CLAMP(G * max_val, 0.0F, max_val);
-	T blue	= (T)CLAMP(B * max_val, 0.0F, max_val);
+	T red	= (T)std::clamp(R * max_val, 0.0F, max_val);
+	T green	= (T)std::clamp(G * max_val, 0.0F, max_val);
+	T blue	= (T)std::clamp(B * max_val, 0.0F, max_val);
 
 	assignRGB(red, green, blue, rgb);
 }
diff --git a/Source/FreeImage/ConversionFloat.cpp b/Source/FreeImage/ConversionFloat.cpp
@@ -185,7 +185,7 @@ FreeImage_ConvertToFloat(FIBITMAP *dib, FIBOOL scale_linear) {
 		case FIT_RGBF:
 			if (scale_linear) {
 				BitmapTransform<float, FIRGBF>(dst, src, [](const FIRGBF& p) {
-					return CLAMP(LUMA_REC709(p.red, p.green, p.blue), 0.0F, 1.0F); });
+					return std::clamp(LUMA_REC709(p.red, p.green, p.blue), 0.0F, 1.0F); });
 			}
 			else {
 				BitmapTransform<float, FIRGBF>(dst, src, [](const FIRGBF& p) {
@@ -196,7 +196,7 @@ FreeImage_ConvertToFloat(FIBITMAP *dib, FIBOOL scale_linear) {
 		case FIT_RGBAF:
 			if (scale_linear) {
 				BitmapTransform<float, FIRGBAF>(dst, src, [](const FIRGBAF& p) {
-					return CLAMP(LUMA_REC709(p.red, p.green, p.blue), 0.0F, 1.0F); });
+					return std::clamp(LUMA_REC709(p.red, p.green, p.blue), 0.0F, 1.0F); });
 			}
 			else {
 				BitmapTransform<float, FIRGBAF>(dst, src, [](const FIRGBAF& p) {
diff --git a/Source/FreeImage/ConversionRGBAF.cpp b/Source/FreeImage/ConversionRGBAF.cpp
@@ -258,7 +258,7 @@ FreeImage_ConvertToRGBAF(FIBITMAP *dib) {
 				for (unsigned x = 0; x < width; x++) {
 					// convert by copying greyscale channel to each R, G, B channels
 					// assume float values are in [0..1]
-					const float value = CLAMP(src_pixel[x], 0.0F, 1.0F);
+					const float value = std::clamp(src_pixel[x], 0.0F, 1.0F);
 					dst_pixel[x].red   = value;
 					dst_pixel[x].green = value;
 					dst_pixel[x].blue  = value;
@@ -281,9 +281,9 @@ FreeImage_ConvertToRGBAF(FIBITMAP *dib) {
 
 				for (unsigned x = 0; x < width; x++) {
 					// convert pixels directly, while adding a "dummy" alpha of 1.0
-					dst_pixel[x].red   = CLAMP(src_pixel[x].red, 0.0F, 1.0F);
-					dst_pixel[x].green = CLAMP(src_pixel[x].green, 0.0F, 1.0F);
-					dst_pixel[x].blue  = CLAMP(src_pixel[x].blue, 0.0F, 1.0F);
+					dst_pixel[x].red   = std::clamp(src_pixel[x].red, 0.0F, 1.0F);
+					dst_pixel[x].green = std::clamp(src_pixel[x].green, 0.0F, 1.0F);
+					dst_pixel[x].blue  = std::clamp(src_pixel[x].blue, 0.0F, 1.0F);
 					dst_pixel[x].alpha = 1.0F;
 				}
 				src_bits += src_pitch;
diff --git a/Source/FreeImage/ConversionRGBF.cpp b/Source/FreeImage/ConversionRGBF.cpp
@@ -255,7 +255,7 @@ FreeImage_ConvertToRGBF(FIBITMAP *dib) {
 				for (unsigned x = 0; x < width; x++) {
 					// convert by copying greyscale channel to each R, G, B channels
 					// assume float values are in [0..1]
-					const float value = CLAMP(src_pixel[x], 0.0F, 1.0F);
+					const float value = std::clamp(src_pixel[x], 0.0F, 1.0F);
 					dst_pixel[x].red   = value;
 					dst_pixel[x].green = value;
 					dst_pixel[x].blue  = value;
@@ -278,7 +278,7 @@ FreeImage_ConvertToRGBF(FIBITMAP *dib) {
 				for (unsigned x = 0; x < width; x++) {
 					// convert by copying greyscale channel to each R, G, B channels
 					// assume float values are in [0..1]
-					const float value = static_cast<float>(CLAMP(src_pixel[x], 0.0, 1.0));
+					const float value = static_cast<float>(std::clamp(src_pixel[x], 0.0, 1.0));
 					dst_pixel[x].red   = value;
 					dst_pixel[x].green = value;
 					dst_pixel[x].blue  = value;
@@ -300,9 +300,9 @@ FreeImage_ConvertToRGBF(FIBITMAP *dib) {
 
 				for (unsigned x = 0; x < width; x++) {
 					// convert and skip alpha channel
-					dst_pixel[x].red   = CLAMP(src_pixel[x].red, 0.0F, 1.0F);
-					dst_pixel[x].green = CLAMP(src_pixel[x].green, 0.0F, 1.0F);
-					dst_pixel[x].blue  = CLAMP(src_pixel[x].blue, 0.0F, 1.0F);
+					dst_pixel[x].red   = std::clamp(src_pixel[x].red, 0.0F, 1.0F);
+					dst_pixel[x].green = std::clamp(src_pixel[x].green, 0.0F, 1.0F);
+					dst_pixel[x].blue  = std::clamp(src_pixel[x].blue, 0.0F, 1.0F);
 				}
 				src_bits += src_pitch;
 				dst_bits += dst_pitch;
diff --git a/Source/FreeImage/ConversionType.cpp b/Source/FreeImage/ConversionType.cpp
@@ -134,7 +134,7 @@ CONVERT_TO_BYTE<Tsrc>::convert(FIBITMAP *src, FIBOOL scale_linear) {
 			for (x = 0; x < width; x++) {
 				// rounding
 				int q = int(src_bits[x] + 0.5);
-				dst_bits[x] = (uint8_t) MIN(255, MAX(0, q));
+				dst_bits[x] = (uint8_t) std::clamp(q, 0, 255);
 			}
 		}
 	}
diff --git a/Source/FreeImage/MNGHelper.cpp b/Source/FreeImage/MNGHelper.cpp
@@ -1206,7 +1206,7 @@ mng_WriteJNG(int format_id, FreeImageIO *io, FIBITMAP *dib, fi_handle handle, in
 			// write chunks
 			for (uint32_t k = 0; k < size_in_bytes;) {
 				uint32_t bytes_left = size_in_bytes - k;
-				uint32_t chunk_size = MIN(JPEG_CHUNK_SIZE, bytes_left);
+				uint32_t chunk_size = std::min(JPEG_CHUNK_SIZE, bytes_left);
 				mng_WriteChunk(mng_JDAT, &jpeg_data[k], chunk_size, hJngMemory);
 				k += chunk_size;
 			}
diff --git a/Source/FreeImage/tmoColorConvert.cpp b/Source/FreeImage/tmoColorConvert.cpp
@@ -243,7 +243,7 @@ LuminanceFromYxy(FIBITMAP *Yxy, float *maxLum, float *minLum, float *worldLum) {
 	for (unsigned y = 0; y < height; y++) {
 		auto *pixel = (const FIRGBF*)bits;
 		for (unsigned x = 0; x < width; x++) {
-			const float Y = MAX(0.0F, pixel[x].red);// avoid negative values
+			const float Y = std::max(0.0F, pixel[x].red);// avoid negative values
 			max_lum = (max_lum < Y) ? Y : max_lum;	// max Luminance in the scene
 			min_lum = (min_lum < Y) ? min_lum : Y;	// min Luminance in the scene
 			sum += log(2.3e-5F + Y);				// contrast constant in Tumblin paper
diff --git a/Source/FreeImage/tmoFattal02.cpp b/Source/FreeImage/tmoFattal02.cpp
@@ -513,7 +513,7 @@ static FIBITMAP* tmoFattal02(FIBITMAP *Y, float alpha, float beta) {
 		// get the number of levels for the pyramid
 		const unsigned width = FreeImage_GetWidth(H);
 		const unsigned height = FreeImage_GetHeight(H);
-		unsigned minsize = MIN(width, height);
+		unsigned minsize = std::min(width, height);
 		while (minsize >= MIN_PYRAMID_SIZE) {
 			nlevels++;
 			minsize /= 2;
@@ -607,8 +607,8 @@ Apply the Gradient Domain High Dynamic Range Compression to a RGBF image and con
 FIBITMAP* DLL_CALLCONV 
 FreeImage_TmoFattal02(FIBITMAP *dib, double color_saturation, double attenuation) {	
 	const float alpha = 0.1F;									// parameter alpha = 0.1
-	const float beta = (float)MAX(0.8, MIN(0.9, attenuation));	// parameter beta = [0.8..0.9]
-	const float s = (float)MAX(0.4, MIN(0.6, color_saturation));// exponent s controls color saturation = [0.4..0.6]
+	const float beta = (float)std::clamp(attenuation, 0.8, 0.9);	// parameter beta = [0.8..0.9]
+	const float s = (float)std::clamp(color_saturation, 0.4, 0.6);// exponent s controls color saturation = [0.4..0.6]
 
 	FIBITMAP *src{};
 	FIBITMAP *Yin{};
diff --git a/Source/FreeImageToolkit/BSplineRotate.cpp b/Source/FreeImageToolkit/BSplineRotate.cpp
@@ -624,7 +624,7 @@ Rotate8Bit(FIBITMAP *dib, double angle, double x_shift, double y_shift, double x
 				p = (double)InterpolatedValue(ImageRasterArray, width, height, x1, y1, spline);
 			}
 			// clamp and convert to uint8_t
-			dst_bits[x] = (uint8_t)MIN(MAX((int)0, (int)(p + 0.5)), (int)255);
+			dst_bits[x] = (uint8_t)std::clamp((int)(p + 0.5), 0, 255);
 		}
 	}
 
diff --git a/Source/FreeImageToolkit/Background.cpp b/Source/FreeImageToolkit/Background.cpp
@@ -853,8 +853,8 @@ FreeImage_EnlargeCanvas(FIBITMAP *src, int left, int top, int right, int bottom,
 		unsigned srcPitch = FreeImage_GetPitch(src);
 		unsigned dstPitch = FreeImage_GetPitch(dst);
 
-		int lineWidth = bytespp * (width + MIN(0, left) + MIN(0, right));
-		int lines = height + MIN(0, top) + MIN(0, bottom);
+		int lineWidth = bytespp * (width + std::min(0, left) + std::min(0, right));
+		int lines = height + std::min(0, top) + std::min(0, bottom);
 
 		if (left <= 0) {
 			srcPtr += (-left * bytespp);
diff --git a/Source/FreeImageToolkit/ClassicRotate.cpp b/Source/FreeImageToolkit/ClassicRotate.cpp
@@ -388,13 +388,13 @@ Rotate90(FIBITMAP *src) {
 				for (unsigned xs = 0; xs < dst_width; xs += RBLOCK) {
 					// y-segment
 					for (unsigned ys = 0; ys < dst_height; ys += RBLOCK) {
-						for (unsigned y = ys; y < MIN(dst_height, ys + RBLOCK); y++) {    // do rotation
+						for (unsigned y = ys; y < std::min(dst_height, ys + RBLOCK); y++) {    // do rotation
 							const unsigned y2 = dst_height - y - 1;
 							// point to src pixel at (y2, xs)
 							const uint8_t *src_bits = bsrc + (xs * src_pitch) + (y2 * bytespp);
 							// point to dst pixel at (xs, y)
 							uint8_t *dst_bits = bdest + (y * dst_pitch) + (xs * bytespp);
-							for (unsigned x = xs; x < MIN(dst_width, xs + RBLOCK); x++) {
+							for (unsigned x = xs; x < std::min(dst_width, xs + RBLOCK); x++) {
 								// dst.SetPixel(x, y, src.GetPixel(y2, x));
 								AssignPixel(dst_bits, src_bits, bytespp);
 								dst_bits += bytespp;
@@ -580,13 +580,13 @@ Rotate270(FIBITMAP *src) {
 				for (unsigned xs = 0; xs < dst_width; xs += RBLOCK) {
 					// y-segment
 					for (unsigned ys = 0; ys < dst_height; ys += RBLOCK) {
-						for (unsigned x = xs; x < MIN(dst_width, xs + RBLOCK); x++) {    // do rotation
+						for (unsigned x = xs; x < std::min(dst_width, xs + RBLOCK); x++) {    // do rotation
 							x2 = dst_width - x - 1;
 							// point to src pixel at (ys, x2)
 							const uint8_t *src_bits = bsrc + (x2 * src_pitch) + (ys * bytespp);
 							// point to dst pixel at (x, ys)
 							uint8_t *dst_bits = bdest + (ys * dst_pitch) + (x * bytespp);
-							for (unsigned y = ys; y < MIN(dst_height, ys + RBLOCK); y++) {
+							for (unsigned y = ys; y < std::min(dst_height, ys + RBLOCK); y++) {
 								// dst.SetPixel(x, y, src.GetPixel(y, x2));
 								AssignPixel(dst_bits, src_bits, bytespp);
 								src_bits += bytespp;
diff --git a/Source/FreeImageToolkit/Colors.cpp b/Source/FreeImageToolkit/Colors.cpp
@@ -312,7 +312,7 @@ FreeImage_AdjustBrightness(FIBITMAP *src, double percentage) {
 	const double scale = (100 + percentage) / 100;
 	for (int i = 0; i < 256; i++) {
 		value = i * scale;
-		value = MAX(0.0, MIN(value, 255.0));
+		value = std::clamp(value, 0.0, 255.0);
 		LUT[i] = (uint8_t)floor(value + 0.5);
 	}
 	return FreeImage_AdjustCurve(src, LUT, FICC_RGB);
@@ -338,7 +338,7 @@ FreeImage_AdjustContrast(FIBITMAP *src, double percentage) {
 	const double scale = (100 + percentage) / 100;
 	for (int i = 0; i < 256; i++) {
 		value = 128 + (i - 128) * scale;
-		value = MAX(0.0, MIN(value, 255.0));
+		value = std::clamp(value, 0.0, 255.0);
 		LUT[i] = (uint8_t)floor(value + 0.5);
 	}
 	return FreeImage_AdjustCurve(src, LUT, FICC_RGB);
@@ -1019,7 +1019,7 @@ FreeImage_GetAdjustColorsLookupTable(uint8_t *LUT, double brightness, double con
 		const double v = (100.0 + contrast) / 100.0;
 		for (int i = 0; i < 256; i++) {
 			value = 128 + (dblLUT[i] - 128) * v;
-			dblLUT[i] = MAX(0.0, MIN(value, 255.0));
+			dblLUT[i] = std::clamp(value, 0.0, 255.0);
 		}
 		result++;
 	}
@@ -1029,7 +1029,7 @@ FreeImage_GetAdjustColorsLookupTable(uint8_t *LUT, double brightness, double con
 		const double v = (100.0 + brightness) / 100.0;
 		for (int i = 0; i < 256; i++) {
 			value = dblLUT[i] * v;
-			dblLUT[i] = MAX(0.0, MIN(value, 255.0));
+			dblLUT[i] = std::clamp(value, 0.0, 255.0);
 		}
 		result++;
 	}
@@ -1040,7 +1040,7 @@ FreeImage_GetAdjustColorsLookupTable(uint8_t *LUT, double brightness, double con
 		const double v = 255.0 * (double)pow((double)255, -exponent);
 		for (int i = 0; i < 256; i++) {
 			value = pow(dblLUT[i], exponent) * v;
-			dblLUT[i] = MAX(0.0, MIN(value, 255.0));
+			dblLUT[i] = std::clamp(value, 0.0, 255.0);
 		}
 		result++;
 	}
diff --git a/Source/FreeImageToolkit/JPEGTransform.cpp b/Source/FreeImageToolkit/JPEGTransform.cpp
@@ -112,8 +112,8 @@ getCropString(char* crop, size_t cropSize, int* left, int* top, int* right, int*
 		return FALSE;
 	}
 
-	*left = CLAMP(*left, 0, width);
-	*top = CLAMP(*top, 0, height);
+	*left = std::clamp(*left, 0, width);
+	*top = std::clamp(*top, 0, height);
 
 	// negative/zero right and bottom count from the edges inwards
 
@@ -124,8 +124,8 @@ getCropString(char* crop, size_t cropSize, int* left, int* top, int* right, int*
 		*bottom = height + *bottom;
 	}
 
-	*right = CLAMP(*right, 0, width);
-	*bottom = CLAMP(*bottom, 0, height);
+	*right = std::clamp(*right, 0, width);
+	*bottom = std::clamp(*bottom, 0, height);
 
 	// test for empty rect
 
diff --git a/Source/FreeImageToolkit/MultigridPoissonSolver.cpp b/Source/FreeImageToolkit/MultigridPoissonSolver.cpp
@@ -469,10 +469,10 @@ FreeImage_MultigridPoissonSolver(FIBITMAP *Laplacian, int ncycle) {
 	const int height = FreeImage_GetHeight(Laplacian);
 
 	// get nearest larger dimension length that is acceptable by the algorithm
-	int n = MAX(width, height);
+	int n = std::max(width, height);
 	int size = 0;
 	while ((n >>= 1) > 0) size++;
-	if ((1 << size) < MAX(width, height)) {
+	if ((1 << size) < std::max(width, height)) {
 		size++;
 	}
 	// size must be of the form 2^j + 1 for some integer j
diff --git a/Source/FreeImageToolkit/Resize.cpp b/Source/FreeImageToolkit/Resize.cpp
@@ -125,7 +125,7 @@ GetRGBAPalette(FIBITMAP *dib, FIRGBA8 * const buffer) {
 	}
 	memcpy(buffer, FreeImage_GetPalette(dib), ncolors * sizeof(FIRGBA8));
 	// merge the transparency table
-	const unsigned ntransp = MIN(ncolors, FreeImage_GetTransparencyCount(dib));
+	const unsigned ntransp = std::min(ncolors, FreeImage_GetTransparencyCount(dib));
 	const uint8_t * const tt = FreeImage_GetTransparencyTable(dib);
 	for (unsigned i = 0; i < ntransp; i++) {
 		buffer[i].alpha = tt[i];
@@ -180,8 +180,8 @@ CWeightsTable::CWeightsTable(CGenericFilter *pFilter, unsigned uDstSize, unsigne
 		const double dCenter = (double)u / dScale + dOffset;
 
 		// find the significant edge points that affect the pixel
-		const int iLeft = MAX(0, (int)(dCenter - dWidth + 0.5));
-		const int iRight = MIN((int)(dCenter + dWidth + 0.5), int(uSrcSize));
+		const int iLeft = std::max(0, (int)(dCenter - dWidth + 0.5));
+		const int iRight = std::min((int)(dCenter + dWidth + 0.5), int(uSrcSize));
 
 		m_WeightTable[u].Left = iLeft; 
 		m_WeightTable[u].Right = iRight;
diff --git a/Source/Metadata/TagConversion.cpp b/Source/Metadata/TagConversion.cpp
@@ -238,7 +238,7 @@ ConvertAnyTag(FITAG *tag) {
 		case FIDT_UNDEFINED:// 8-bit untyped data 
 		default:
 		{
-			int max_size = MIN((int)FreeImage_GetTagLength(tag), (int)MAX_TEXT_EXTENT);
+			int max_size = std::min((int)FreeImage_GetTagLength(tag), (int)MAX_TEXT_EXTENT);
 			if (max_size == MAX_TEXT_EXTENT)
 				max_size--;
 			memcpy(format, (char*)FreeImage_GetTagValue(tag), max_size);
@@ -337,7 +337,7 @@ ConvertExifTag(FITAG *tag) {
 		{
 			const char *componentStrings[7] = {"", "Y", "Cb", "Cr", "R", "G", "B"};
 			auto *pvalue = (const uint8_t*)FreeImage_GetTagValue(tag);
-			for (uint32_t i = 0; i < MIN((uint32_t)4, FreeImage_GetTagCount(tag)); i++) {
+			for (uint32_t i = 0; i < std::min((uint32_t)4, FreeImage_GetTagCount(tag)); i++) {
 				int j = pvalue[i];
 				if (j > 0 && j < 7)
 					buffer += componentStrings[j];
diff --git a/Source/Plugins/PSDParser.cpp b/Source/Plugins/PSDParser.cpp
@@ -1253,7 +1253,7 @@ bool psdParser::ReadImageResources(FreeImageIO *io, fi_handle handle, int32_t le
 					default:
 					{
 						// skip resource
-						unsigned skip_length = MIN(oResource._Size, nTotalBytes - nBytes);
+						unsigned skip_length = std::min(oResource._Size, nTotalBytes - nBytes);
 						io->seek_proc(handle, skip_length, SEEK_CUR);
 						nBytes += skip_length;
 					}
diff --git a/Source/Plugins/PluginBMP.cpp b/Source/Plugins/PluginBMP.cpp
@@ -229,7 +229,7 @@ LoadPixelDataRLE4(FreeImageIO *io, fi_handle handle, int width, int height, FIBI
 				throw(1);
 			}
 			if (status_byte != 0)	{
-				status_byte = (int)MIN((size_t)status_byte, (size_t)(end - q));
+				status_byte = (int)std::min((size_t)status_byte, (size_t)(end - q));
 				// Encoded mode
 				if (io->read_proc(&second_byte, sizeof(uint8_t), 1, handle) != 1) {
 					throw(1);
@@ -284,7 +284,7 @@ LoadPixelDataRLE4(FreeImageIO *io, fi_handle handle, int width, int height, FIBI
 					default:
 					{
 						// Absolute mode
-						status_byte = (int)MIN((size_t)status_byte, (size_t)(end - q));
+						status_byte = (int)std::min((size_t)status_byte, (size_t)(end - q));
 						for (int i = 0; i < status_byte; i++) {
 							if ((i & 0x01) == 0) {
 								if (io->read_proc(&second_byte, sizeof(uint8_t), 1, handle) != 1) {
@@ -399,7 +399,7 @@ LoadPixelDataRLE8(FreeImageIO *io, fi_handle handle, int width, int height, FIBI
 							return TRUE;
 						}
 
-						int count = MIN((int)status_byte, width - bits);
+						int count = std::min((int)status_byte, width - bits);
 
 						uint8_t *sline = FreeImage_GetScanLine(dib, scanline);
 
@@ -429,7 +429,7 @@ LoadPixelDataRLE8(FreeImageIO *io, fi_handle handle, int width, int height, FIBI
 					return TRUE;
 				}
 
-				int count = MIN((int)status_byte, width - bits);
+				int count = std::min((int)status_byte, width - bits);
 
 				uint8_t *sline = FreeImage_GetScanLine(dib, scanline);
 
diff --git a/Source/Plugins/PluginEXR.cpp b/Source/Plugins/PluginEXR.cpp
@@ -372,7 +372,7 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) {
 			while (dw.min.y <= dw.max.y) {
 				// read a chunk
 				rgbaFile.setFrameBuffer (&chunk[0][0] - dw.min.x - dw.min.y * width, 1, width);
-				rgbaFile.readPixels (dw.min.y, MIN(dw.min.y + chunk_size - 1, dw.max.y));
+				rgbaFile.readPixels (dw.min.y, std::min(dw.min.y + chunk_size - 1, dw.max.y));
 				// fill the dib
 				const int y_max = ((dw.max.y - dw.min.y) <= chunk_size) ? (dw.max.y - dw.min.y) : chunk_size;
 				for ( int y = 0; y < y_max; y++) {
diff --git a/Source/Plugins/PluginIFF.cpp b/Source/Plugins/PluginIFF.cpp
@@ -279,7 +279,7 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) {
 
 				FIRGBA8 *pal = FreeImage_GetPalette(dib.get());
 				if (pal) {
-					unsigned palette_entries = MIN((unsigned)ch_size / 3, FreeImage_GetColorsUsed(dib.get()));
+					unsigned palette_entries = std::min((unsigned)ch_size / 3, FreeImage_GetColorsUsed(dib.get()));
 					for (unsigned k = 0; k < palette_entries; k++) {
 						io->read_proc(&pal[k].red, 1, 1, handle );
 						io->read_proc(&pal[k].green, 1, 1, handle );
diff --git a/Source/Plugins/PluginJPEG.cpp b/Source/Plugins/PluginJPEG.cpp
diff --git a/Source/Plugins/PluginPCX.cpp b/Source/Plugins/PluginPCX.cpp
diff --git a/Source/Plugins/PluginPNG.cpp b/Source/Plugins/PluginPNG.cpp
diff --git a/Source/Plugins/PluginTARGA.cpp b/Source/Plugins/PluginTARGA.cpp
diff --git a/Source/Plugins/PluginWebP.cpp b/Source/Plugins/PluginWebP.cpp

Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ CONVERT_TO_BYTE<Tsrc>::convert(FIBITMAP *src, FIBOOL scale_linear) {`
`134`	`134`	`for (x = 0; x < width; x++) {`
`135`	`135`	`// rounding`
`136`	`136`	`int q = int(src_bits[x] + 0.5);`
`137`		`- dst_bits[x] = (uint8_t) MIN(255, MAX(0, q));`
	`137`	`+ dst_bits[x] = (uint8_t) std::clamp(q, 0, 255);`
`138`	`138`	`}`
`139`	`139`	`}`
`140`	`140`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1206,7 +1206,7 @@ mng_WriteJNG(int format_id, FreeImageIO io, FIBITMAP dib, fi_handle handle, in`
`1206`	`1206`	`// write chunks`
`1207`	`1207`	`for (uint32_t k = 0; k < size_in_bytes;) {`
`1208`	`1208`	`uint32_t bytes_left = size_in_bytes - k;`
`1209`		`- uint32_t chunk_size = MIN(JPEG_CHUNK_SIZE, bytes_left);`
	`1209`	`+ uint32_t chunk_size = std::min(JPEG_CHUNK_SIZE, bytes_left);`
`1210`	`1210`	`mng_WriteChunk(mng_JDAT, &jpeg_data[k], chunk_size, hJngMemory);`
`1211`	`1211`	`k += chunk_size;`
`1212`	`1212`	`}`
Original file line number	Diff line number	Diff line change
`@@ -624,7 +624,7 @@ Rotate8Bit(FIBITMAP *dib, double angle, double x_shift, double y_shift, double x`
`624`	`624`	`p = (double)InterpolatedValue(ImageRasterArray, width, height, x1, y1, spline);`
`625`	`625`	`}`
`626`	`626`	`// clamp and convert to uint8_t`
`627`		`- dst_bits[x] = (uint8_t)MIN(MAX((int)0, (int)(p + 0.5)), (int)255);`
	`627`	`+ dst_bits[x] = (uint8_t)std::clamp((int)(p + 0.5), 0, 255);`
`628`	`628`	`}`
`629`	`629`	`}`
`630`	`630`