enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

fix gl engine bitmap fonts :) 

SVN revision: 72256
This commit is contained in:
Carsten Haitzler 2012-06-17 02:23:49 +00:00
parent 7e326357fb
commit 2256af3421
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
legacy/evas/ChangeLog
View File

@ -817,3 +817,8 @@
2012-06-15 Mike Blumenkrantz
* 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

5
legacy/evas/src/modules/engines/gl_common/evas_gl_font.c
View File

@ -23,7 +23,8 @@ evas_gl_font_texture_new(void *context, RGBA_Font_Glyph *fg)
nw = ((w + 3) / 4) * 4;
ndata = alloca(nw *h);
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;
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;
int bi, bj, end;