forked from enlightenment/efl
parent
7e326357fb
commit
2256af3421
|
@ -817,3 +817,8 @@
|
||||||
2012-06-15 Mike Blumenkrantz
|
2012-06-15 Mike Blumenkrantz
|
||||||
|
|
||||||
* evas_object_smart_members_get() now returns NULL on non-smart objects
|
* evas_object_smart_members_get() now returns NULL on non-smart objects
|
||||||
|
|
||||||
|
2012-04-26 Carsten Haitzler (The Rasterman)
|
||||||
|
|
||||||
|
* Fix GL engine bitmap font handling
|
||||||
|
|
||||||
|
|
|
@ -23,7 +23,8 @@ evas_gl_font_texture_new(void *context, RGBA_Font_Glyph *fg)
|
||||||
nw = ((w + 3) / 4) * 4;
|
nw = ((w + 3) / 4) * 4;
|
||||||
ndata = alloca(nw *h);
|
ndata = alloca(nw *h);
|
||||||
if (!ndata) return NULL;
|
if (!ndata) return NULL;
|
||||||
if (fg->glyph_out->bitmap.num_grays == 256)
|
if ((fg->glyph_out->bitmap.num_grays == 256) &&
|
||||||
|
(fg->glyph_out->bitmap.pixel_mode == FT_PIXEL_MODE_GRAY))
|
||||||
{
|
{
|
||||||
int x, y;
|
int x, y;
|
||||||
DATA8 *p1, *p2;
|
DATA8 *p1, *p2;
|
||||||
|
@ -40,7 +41,7 @@ evas_gl_font_texture_new(void *context, RGBA_Font_Glyph *fg)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (fg->glyph_out->bitmap.num_grays == 0)
|
else
|
||||||
{
|
{
|
||||||
DATA8 *tmpbuf = NULL, *dp, *tp, bits;
|
DATA8 *tmpbuf = NULL, *dp, *tp, bits;
|
||||||
int bi, bj, end;
|
int bi, bj, end;
|
||||||
|
|
Loading…
Reference in New Issue