diff options
| author | degasus <wickmarkus@web.de> | 2014-03-17 08:50:59 +0100 |
|---|---|---|
| committer | degasus <wickmarkus@web.de> | 2014-05-05 17:06:36 +0200 |
| commit | 25b8edd2a6c18b60586bbb39d539b939c1dc8515 (patch) | |
| tree | 2c44847ae8baad05af5b6b022ebf8a3cde56214d /Source/Core/VideoBackends/OGL/RasterFont.cpp | |
| parent | 07fbb13bbac7fd9449ad2ad81dd9e88e22a12b04 (diff) | |
ogl: fix signed vs unsigned comparison warning
Diffstat (limited to 'Source/Core/VideoBackends/OGL/RasterFont.cpp')
| -rw-r--r-- | Source/Core/VideoBackends/OGL/RasterFont.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Source/Core/VideoBackends/OGL/RasterFont.cpp b/Source/Core/VideoBackends/OGL/RasterFont.cpp index 8e6ad2d6c8..d281f9a554 100644 --- a/Source/Core/VideoBackends/OGL/RasterFont.cpp +++ b/Source/Core/VideoBackends/OGL/RasterFont.cpp @@ -10,10 +10,10 @@ namespace OGL { -static const u32 char_width = 8; -static const u32 char_height = 13; -static const u32 char_offset = 32; -static const u32 char_count = 95; +static const int char_width = 8; +static const int char_height = 13; +static const int char_offset = 32; +static const int char_count = 95; const u8 rasters[char_count][char_height] = { {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, @@ -141,11 +141,11 @@ RasterFont::RasterFont() glActiveTexture(GL_TEXTURE0+8); glBindTexture(GL_TEXTURE_2D, texture); u32* texture_data = new u32[char_width*char_count*char_height]; - for (u32 y = 0; y < char_height; y++) + for (int y = 0; y < char_height; y++) { - for (u32 c = 0; c < char_count; c++) + for (int c = 0; c < char_count; c++) { - for (u32 x = 0; x < char_width; x++) + for (int x = 0; x < char_width; x++) { bool pixel = (0 != (rasters[c][y] & (1<<(char_width-x-1)))); texture_data[char_width*char_count*y+char_width*c+x] = pixel ? -1 : 0; |