Browse Source

* Hopefully fix 64-bit bug.

tags/v0.99.beta14
Sam Hocevar sam 18 years ago
parent
commit
2b00f62d2e
2 changed files with 6 additions and 5 deletions
  1. +4
    -3
      caca/driver_gl.c
  2. +2
    -2
      cucul/font.c

+ 4
- 3
caca/driver_gl.c View File

@@ -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,


+ 2
- 2
cucul/font.c View File

@@ -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. */


Loading…
Cancel
Save