Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix for own warning

Browse Source
This commit is contained in:
Campbell Barton
2007-12-13 12:50:36 +00:00
parent 8e81daa8bc
commit 6d6f5bbc1a
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
intern/bmfont/intern/BMF_BitmapFont.cpp
View File

@@ -291,20 +291,20 @@ void BMF_BitmapFont::DrawStringBuf(char *str, int posx, int posy, float *col, un
if (fbuf) { if (fbuf) {
float *pixel, *max; float *pixel, *max;
unsigned char c; unsigned char c;
int x, y; int xi, yi;
max = fbuf + (4 * (w * h)); max = fbuf + (4 * (w * h));
while ((c = (unsigned char) *str++)) { while ((c = (unsigned char) *str++)) {
BMF_CharData & cd = m_fontData->chars[c]; BMF_CharData & cd = m_fontData->chars[c];
if (cd.data_offset != -1) { if (cd.data_offset != -1) {
for (y = 0; y < cd.height; y++) { for (yi = 0; yi < cd.height; yi++) {
unsigned char* chrRow = &m_fontData->bitmap_data[cd.data_offset + ((cd.width+7)/8)*y]; unsigned char* chrRow = &m_fontData->bitmap_data[cd.data_offset + ((cd.width+7)/8)*yi];
for (x = cd.xorig; x < cd.width; x++) { for (xi = cd.xorig; xi < cd.width; xi++) {
pixel = fbuf + 4 * (((posy + y - cd.yorig) * w) + (posx + x)); pixel = fbuf + 4 * (((posy + yi - cd.yorig) * w) + (posx + xi));
if ((pixel < max) && (pixel > fbuf)) { if ((pixel < max) && (pixel > fbuf)) {
int byteIdx = x/8; int byteIdx = xi/8;
int bitIdx = 7 - (x%8); int bitIdx = 7 - (xi%8);
if (chrRow[byteIdx]&(1<<bitIdx)) { if (chrRow[byteIdx]&(1<<bitIdx)) {
pixel[0] = col[0]; pixel[0] = col[0];