mirrors/imgui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Warning fixes for 64-bit architectures

Browse Source
This commit is contained in:
ocornut 2015-01-20 01:01:25 +01:00
parent 53f4fd38e4
commit b0eac255ca
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/directx9_example/main.cpp
View File

@ -35,7 +35,7 @@ static void ImImpl_RenderDrawLists(ImDrawList** const cmd_lists, int cmd_lists_c
// Copy and convert all vertices into a single contiguous buffer // Copy and convert all vertices into a single contiguous buffer
CUSTOMVERTEX* vtx_dst; CUSTOMVERTEX* vtx_dst;
if (g_pVB->Lock(0, total_vtx_count, (void**)&vtx_dst, D3DLOCK_DISCARD) < 0) if (g_pVB->Lock(0, (UINT)total_vtx_count, (void**)&vtx_dst, D3DLOCK_DISCARD) < 0)
return; return;
for (int n = 0; n < cmd_lists_count; n++) for (int n = 0; n < cmd_lists_count; n++)
{ {

4
imgui.cpp
View File

@ -6532,7 +6532,7 @@ bool ImFontAtlas::Build()
// Setup ranges // Setup ranges
int glyph_count = 0; int glyph_count = 0;
size_t glyph_ranges_count = 0; int glyph_ranges_count = 0;
for (const ImWchar* in_range = data.GlyphRanges; in_range[0] && in_range[1]; in_range += 2) for (const ImWchar* in_range = data.GlyphRanges; in_range[0] && in_range[1]; in_range += 2)
{ {
glyph_count += (in_range[1] - in_range[0]) + 1; glyph_count += (in_range[1] - in_range[0]) + 1;
@ -6541,7 +6541,7 @@ bool ImFontAtlas::Build()
data.Ranges = buf_ranges + buf_ranges_n; data.Ranges = buf_ranges + buf_ranges_n;
data.RangesCount = glyph_ranges_count; data.RangesCount = glyph_ranges_count;
buf_ranges_n += glyph_ranges_count; buf_ranges_n += glyph_ranges_count;
for (size_t i = 0; i < glyph_ranges_count; i++) for (int i = 0; i < glyph_ranges_count; i++)
{ {
const ImWchar* in_range = &data.GlyphRanges[i * 2]; const ImWchar* in_range = &data.GlyphRanges[i * 2];
stbtt_pack_range& range = data.Ranges[i]; stbtt_pack_range& range = data.Ranges[i];