From 2b00f62d2e71dd8337953ebe7e778df2bb1a9aa7 Mon Sep 17 00:00:00 2001 From: Sam Hocevar Date: Tue, 19 Sep 2006 18:47:39 +0000 Subject: [PATCH] * Hopefully fix 64-bit bug. --- caca/driver_gl.c | 7 ++++--- cucul/font.c | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/caca/driver_gl.c b/caca/driver_gl.c index 48e1d7c..4bd52fc 100644 --- a/caca/driver_gl.c +++ b/caca/driver_gl.c @@ -254,9 +254,9 @@ static void gl_display(caca_display_t *dp) uint16_t fg; int i, b; - for(b = 0, i = 0; (dp->drv.p->blocks[i + 1]); i += 2) + for(b = 0, i = 0; dp->drv.p->blocks[i + 1]; i += 2) { - if(cv < (dp->drv.p->blocks[i]&0xFFFFFFFF)) + if(cv < (uint32_t)dp->drv.p->blocks[i]) break; if(cv >= (dp->drv.p->blocks[i + 1])) @@ -266,7 +266,8 @@ static void gl_display(caca_display_t *dp) } glBindTexture(GL_TEXTURE_2D, - dp->drv.p->txid[b + cv - (dp->drv.p->blocks[i]&0xFFFFFFFF)]); + dp->drv.p->txid[b + cv + - (uint32_t)dp->drv.p->blocks[i]]); fg = _cucul_argb32_to_rgb12fg(*attr); glColor3b(((fg & 0xf00) >> 8) * 8, diff --git a/cucul/font.c b/cucul/font.c index b4eb32d..139ecdf 100644 --- a/cucul/font.c +++ b/cucul/font.c @@ -432,9 +432,9 @@ int cucul_render_canvas(cucul_canvas_t *cv, cucul_font_t *f, b = f->header.blocks; break; } - if(ch < f->block_list[b].stop) { + + if(ch < f->block_list[b].stop) break; - } } /* Glyph not in font? Skip it. */