Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/engines/common
Modified Files:
evas_font_load.c
Log Message:
oops fix stringshare conversion bug.
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/evas/src/lib/engines/common/evas_font_load.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- evas_font_load.c 30 Nov 2005 08:45:20 -0000 1.27
+++ evas_font_load.c 2 Dec 2005 03:15:08 -0000 1.28
@@ -18,11 +18,10 @@
fs = calloc(1, sizeof(RGBA_Font_Source) + data_size);
if (!fs) return NULL;
- fs->file = NULL;
fs->data = ((unsigned char *)fs) + sizeof(RGBA_Font_Source);
+ fs->data_size = data_size;
fs->current_size = 0;
memcpy(fs->data, data, data_size);
- fs->data_size = data_size;
error = FT_New_Memory_Face(evas_ft_lib, fs->data, fs->data_size, 0,
&(fs->ft.face));
if (error)
{
@@ -30,6 +29,7 @@
return NULL;
}
fs->name = evas_stringshare_add(name);
+ fs->file = NULL;
error = FT_Select_Charmap(fs->ft.face, ft_encoding_unicode);
fs->ft.orig_upem = fs->ft.face->units_per_EM;
fs->references = 1;
@@ -45,17 +45,17 @@
fs = calloc(1, sizeof(RGBA_Font_Source));
if (!fs) return NULL;
- fs->file = fs->name;
fs->data = NULL;
fs->data_size = 0;
fs->current_size = 0;
- error = FT_New_Face(evas_ft_lib, fs->file, 0, &(fs->ft.face));
+ error = FT_New_Face(evas_ft_lib, name, 0, &(fs->ft.face));
if (error)
{
free(fs);
return NULL;
}
fs->name = evas_stringshare_add(name);
+ fs->file = fs->name;
error = FT_Select_Charmap(fs->ft.face, ft_encoding_unicode);
fs->ft.orig_upem = fs->ft.face->units_per_EM;
fs->references = 1;
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
