diff --git a/caca/driver_gl.c b/caca/driver_gl.c index 27759dc..f2ed3f8 100644 --- a/caca/driver_gl.c +++ b/caca/driver_gl.c @@ -256,19 +256,19 @@ static void gl_display(caca_display_t *dp) for(b = 0, i = 0; dp->drv.p->blocks[i + 1]; i += 2) { - if(cv < (uint32_t)dp->drv.p->blocks[i]) + if(cv < dp->drv.p->blocks[i]) break; - if(cv >= (uint32_t)dp->drv.p->blocks[i + 1]) + if(cv >= dp->drv.p->blocks[i + 1]) { - b += (uint32_t)(dp->drv.p->blocks[i + 1] + b += (dp->drv.p->blocks[i + 1] - dp->drv.p->blocks[i]); continue; } glBindTexture(GL_TEXTURE_2D, dp->drv.p->txid[b + cv - - (uint32_t)dp->drv.p->blocks[i]]); + - dp->drv.p->blocks[i]]); fg = _cucul_argb32_to_rgb12fg(*attr); glColor3b(((fg & 0xf00) >> 8) * 8, @@ -498,7 +498,7 @@ static void gl_compute_font(caca_display_t *dp) int i, b, w, h, x, y; /* Count how many glyphs this font has */ - dp->drv.p->blocks = (uint32_t)cucul_get_font_blocks(dp->drv.p->f); + dp->drv.p->blocks = (uint32_t*)cucul_get_font_blocks(dp->drv.p->f); for(b = 0, i = 0; dp->drv.p->blocks[i + 1]; i += 2) b += (int)(dp->drv.p->blocks[i + 1] - dp->drv.p->blocks[i]);