From 1adb98f1425115d821d26aee8f92a4efa1ac7734 Mon Sep 17 00:00:00 2001 From: Jorge Rodriguez Date: Tue, 14 Mar 2017 19:13:00 -0700 Subject: [PATCH] Fix some MSVC /W4 warnings --- stb_image_resize.h | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/stb_image_resize.h b/stb_image_resize.h index e563165..5499ded 100644 --- a/stb_image_resize.h +++ b/stb_image_resize.h @@ -552,9 +552,9 @@ typedef struct } stbir__info; -static const double stbir__max_uint8_as_float = 255.0f; -static const double stbir__max_uint16_as_float = 65535.0f; -static const double stbir__max_uint32_as_float = 4294967295.0f; +static const float stbir__max_uint8_as_float = 255.0f; +static const float stbir__max_uint16_as_float = 65535.0f; +static const double stbir__max_uint32_as_float = 4294967295.0; static stbir__inline int stbir__min(int a, int b) @@ -1713,9 +1713,13 @@ static void stbir__encode_scanline(stbir__info* stbir_info, int num_pixels, void // build a table of all channels that need colorspace correction, so // we don't perform colorspace correction on channels that don't need it. - for (x=0, num_nonalpha=0; x < channels; ++x) - if (x != alpha_channel || (stbir_info->flags & STBIR_FLAG_ALPHA_USES_COLORSPACE)) - nonalpha[num_nonalpha++] = x; + for (x = 0, num_nonalpha = 0; x < channels; ++x) + { + if (x != alpha_channel || (stbir_info->flags & STBIR_FLAG_ALPHA_USES_COLORSPACE)) + { + nonalpha[num_nonalpha++] = (stbir_uint16)x; + } + } #define STBIR__ROUND_INT(f) ((int) ((f)+0.5)) #define STBIR__ROUND_UINT(f) ((stbir_uint32) ((f)+0.5))