From 6403d9b5a6968719eefbd9c9d33c62a9df0e7f5e Mon Sep 17 00:00:00 2001 From: bkaradzic Date: Wed, 24 Apr 2013 22:03:04 -0700 Subject: [PATCH] Fixed GCC warnings. --- 3rdparty/stb_truetype/stb_truetype.h | 3 +-- examples/09-hdr/hdr.cpp | 1 - examples/common/processevents.h | 6 ++++++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/3rdparty/stb_truetype/stb_truetype.h b/3rdparty/stb_truetype/stb_truetype.h index 9f07124a..2db3ce0e 100644 --- a/3rdparty/stb_truetype/stb_truetype.h +++ b/3rdparty/stb_truetype/stb_truetype.h @@ -915,7 +915,6 @@ int stbtt_FindGlyphIndex(const stbtt_fontinfo *info, int unicode_codepoint) // now decrement to bias correctly to find smallest search -= 2; while (entrySelector) { - stbtt_uint16 start, end; searchRange >>= 1; start = ttUSHORT(data + search + 2 + segcount*2 + 2); end = ttUSHORT(data + search + 2); @@ -2062,4 +2061,4 @@ int stbtt_FindMatchingFont(const unsigned char *font_collection, const char *nam } } -#endif // STB_TRUETYPE_IMPLEMENTATION \ No newline at end of file +#endif // STB_TRUETYPE_IMPLEMENTATION diff --git a/examples/09-hdr/hdr.cpp b/examples/09-hdr/hdr.cpp index 1f289372..fcb6f74c 100644 --- a/examples/09-hdr/hdr.cpp +++ b/examples/09-hdr/hdr.cpp @@ -14,7 +14,6 @@ #include "../common/processevents.h" #include "../common/imgui/imgui.h" -#include #include #include #include diff --git a/examples/common/processevents.h b/examples/common/processevents.h index 3b2e59a6..3228e9f2 100644 --- a/examples/common/processevents.h +++ b/examples/common/processevents.h @@ -8,6 +8,12 @@ struct MouseState { + MouseState() + : m_mx(0) + , m_my(0) + { + } + uint32_t m_mx; uint32_t m_my; uint8_t m_buttons[entry::MouseButton::Count];