diff options
author | Campbell Barton <ideasman42@gmail.com> | 2007-12-13 15:50:36 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2007-12-13 15:50:36 +0300 |
commit | 6d6f5bbc1a79c2ed2fb8ce84dd4fc23e4763d926 (patch) | |
tree | 1fe2fc7774f13216445ef994d2bf4f305e3a597a /intern | |
parent | 8e81daa8bc09b5c2ef7c9d26b6c9bc8628d38f02 (diff) |
fix for own warning
Diffstat (limited to 'intern')
-rw-r--r-- | intern/bmfont/intern/BMF_BitmapFont.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/intern/bmfont/intern/BMF_BitmapFont.cpp b/intern/bmfont/intern/BMF_BitmapFont.cpp index 2ea14b4b203..8e670c099a3 100644 --- a/intern/bmfont/intern/BMF_BitmapFont.cpp +++ b/intern/bmfont/intern/BMF_BitmapFont.cpp @@ -291,20 +291,20 @@ void BMF_BitmapFont::DrawStringBuf(char *str, int posx, int posy, float *col, un if (fbuf) { float *pixel, *max; unsigned char c; - int x, y; + int xi, yi; max = fbuf + (4 * (w * h)); while ((c = (unsigned char) *str++)) { BMF_CharData & cd = m_fontData->chars[c]; if (cd.data_offset != -1) { - for (y = 0; y < cd.height; y++) { - unsigned char* chrRow = &m_fontData->bitmap_data[cd.data_offset + ((cd.width+7)/8)*y]; - for (x = cd.xorig; x < cd.width; x++) { - pixel = fbuf + 4 * (((posy + y - cd.yorig) * w) + (posx + x)); + for (yi = 0; yi < cd.height; yi++) { + unsigned char* chrRow = &m_fontData->bitmap_data[cd.data_offset + ((cd.width+7)/8)*yi]; + for (xi = cd.xorig; xi < cd.width; xi++) { + pixel = fbuf + 4 * (((posy + yi - cd.yorig) * w) + (posx + xi)); if ((pixel < max) && (pixel > fbuf)) { - int byteIdx = x/8; - int bitIdx = 7 - (x%8); + int byteIdx = xi/8; + int bitIdx = 7 - (xi%8); if (chrRow[byteIdx]&(1<<bitIdx)) { pixel[0] = col[0]; |