From 0a6577a6df495e49d6db0784551843f772e37671 Mon Sep 17 00:00:00 2001 From: ocornut Date: Mon, 2 Feb 2015 08:51:45 +0000 Subject: [PATCH] Fixed warnings --- imgui.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/imgui.cpp b/imgui.cpp index 3b979e3b..a372c991 100644 --- a/imgui.cpp +++ b/imgui.cpp @@ -6675,8 +6675,8 @@ bool ImFontAtlas::Build() // Pack our extra data rectangle first, so it will be on the upper-left corner of our texture (UV will have small values). stbrp_rect extra_rect; - extra_rect.w = (int)TEX_ATLAS_SIZE.x; - extra_rect.h = (int)TEX_ATLAS_SIZE.y; + extra_rect.w = (stbrp_coord)TEX_ATLAS_SIZE.x; + extra_rect.h = (stbrp_coord)TEX_ATLAS_SIZE.y; stbrp_pack_rects((stbrp_context*)spc.pack_info, &extra_rect, 1); TexExtraDataPos = ImVec2(extra_rect.x, extra_rect.y); @@ -8745,7 +8745,7 @@ static unsigned int stb_adler32(unsigned int adler32, unsigned char *buffer, uns buflen -= blocklen; blocklen = 5552; } - return (s2 << 16) + s1; + return (unsigned int)(s2 << 16) + (unsigned int)s1; } static unsigned int stb_decompress(unsigned char *output, unsigned char *i, unsigned int length)