FIX: warning C4018: signed/unsigned mismatch

Author: Oldes

src/core/n-image.c

@@ -354,8 +354,7 @@ typedef struct REBCLR {
 	REBVAL* val_img = D_ARG(1);
 	REBVAL* val_rad = D_ARG(2);
 	REBINT radius = IS_INTEGER(val_rad) ? VAL_INT32(val_rad) : (REBINT)round(VAL_DECIMAL(val_rad));
-
-	BlurImage(VAL_SERIES(val_img), radius);
+	if (radius > 0) BlurImage(VAL_SERIES(val_img), (REBCNT)radius);
 	return R_ARG1;
 }
 

src/core/u-image-blur.c

@@ -181,15 +181,15 @@ void fast_gauss_blur(REBYTE*scl, REBYTE*tcl, REBINT w, REBINT h, REBINT r, REBIN
 	}
 }
 
-void BlurImage(REBSER *image, REBINT radius)
+void BlurImage(REBSER *image, REBCNT radius)
 {
 	REBSER *temp_image;
 
 	// Validate input.
 	if ( image == NULL
 		|| (IMG_WIDE(image) == 0UL)
 		|| (IMG_HIGH(image) == 0UL)
-		|| radius <= 0
+		|| radius == 0
 	) return;
 
 	radius = MIN(radius, IMG_WIDE(image) / 2);

src/core/u-png-filter.c

@@ -97,13 +97,13 @@ static REBYTE get_png_filter_type(REBVAL* val) {
 	REBYTE *bin = VAL_BIN_DATA(val_data);
 	REBYTE *scan, *prev, *temp, *out;
 	REBCNT r, c, rows, bytes;
-	REBINT width = AS_INT32(val_width);
+	REBCNT width = (REBCNT)AS_INT32(val_width);
 	REBYTE filter = get_png_filter_type(val_type);
 	REBCNT bpp = ref_skip ? VAL_INT32(val_bpp) : 1;
 
 	bytes = VAL_LEN(val_data);
 
-	if (width <= 1 || width > bytes)
+	if ((REBINT)width <= 1 || width > bytes)
 		Trap1(RE_INVALID_ARG, val_width);
 	if (bpp < 1 || bpp > width)
 		Trap1(RE_INVALID_ARG, val_bpp);
@@ -180,15 +180,15 @@ static REBYTE get_png_filter_type(REBVAL* val) {
 
 	REBSER *ser;
 	REBYTE *bin = VAL_BIN_DATA(val_data);
-	REBINT width = AS_INT32(val_width);
+	REBCNT width = (REBCNT)AS_INT32(val_width);
 	REBCNT r, c, rows;
 	REBYTE *scan, *prev, *temp, *out;
 	REBYTE filter = 0;
 	REBCNT bytes = VAL_LEN(val_data);
 	REBCNT bpp = ref_skip ? VAL_INT32(val_bpp) : 1;
 
 	if (!ref_as) width++;
-	if (width <= 1 || width > bytes)
+	if ((REBINT)width <= 1 || width > bytes)
 		Trap1(RE_INVALID_ARG, val_width);
 	if (bpp < 1 || bpp > width)
 		Trap1(RE_INVALID_ARG, val_bpp);

src/include/sys-blur.h

@@ -1,6 +1,6 @@
 #ifndef __INCLUDE_BLUR_H__
 #define __INCLUDE_BLUR_H__
 
-void BlurImage(REBSER *image, REBINT radius);
+void BlurImage(REBSER *image, REBCNT radius);
 
 #endif