Enlightenment CVS committal
Author : doursse
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/engines/common
Modified Files:
evas_font_load.c evas_font_draw.c
Log Message:
evas_common_array_hash_free --> evas_array_hash_free
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/lib/engines/common/evas_font_load.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -3 -r1.42 -r1.43
--- evas_font_load.c 8 Feb 2008 19:55:03 -0000 1.42
+++ evas_font_load.c 10 Jul 2008 18:08:18 -0000 1.43
@@ -1,6 +1,7 @@
/*
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
*/
+
#include "evas_common.h"
#include "evas_private.h"
@@ -52,12 +53,12 @@
fs->data_size = 0;
fs->current_size = 0;
fs->ft.face = NULL;
-
+
fs->name = evas_stringshare_add(name);
fs->file = fs->name;
-
+
fs->ft.orig_upem = 0;
-
+
fs->references = 1;
fonts_src = evas_object_list_prepend(fonts_src, fs);
return fs;
@@ -67,16 +68,16 @@
evas_common_font_source_load_complete(RGBA_Font_Source *fs)
{
int error;
-
- error = FT_New_Face(evas_ft_lib, fs->file, 0, &(fs->ft.face));
- if (error)
+
+ error = FT_New_Face(evas_ft_lib, fs->file, 0, &(fs->ft.face));
+ if (error)
{
fs->ft.face = NULL;
return error;
}
-
+
error = FT_Select_Charmap(fs->ft.face, ft_encoding_unicode);
- if (error)
+ if (error)
{
FT_Done_Face(fs->ft.face);
fs->ft.face = NULL;
@@ -117,7 +118,7 @@
fonts_src = evas_object_list_remove(fonts_src, fs);
FT_Done_Face(fs->ft.face);
- if (fs->charmap) evas_common_array_hash_free(fs->charmap);
+ if (fs->charmap) evas_array_hash_free(fs->charmap);
if (fs->name) evas_stringshare_del(fs->name);
free(fs);
}
@@ -132,7 +133,7 @@
RGBA_Font_Int *fi;
fi = l->data;
-
+
if (fi->src->current_size != fi->size)
{
FT_Activate_Size(fi->ft.size);
@@ -153,7 +154,7 @@
if (!fi) return NULL;
fi->src = evas_common_font_source_find(name);
- if (!fi->src)
+ if (!fi->src)
fi->src = evas_common_font_source_memory_load(name, data, data_size);
if (!fi->src)
@@ -177,7 +178,7 @@
fi = evas_common_font_int_find(name, size);
if (fi) return fi;
-
+
fi = calloc(1, sizeof(RGBA_Font_Int));
if (!fi) return NULL;
@@ -255,7 +256,7 @@
}
}
fi->src->current_size = fi->size;
-
+
return fi;
}
EAPI RGBA_Font *
@@ -263,7 +264,7 @@
{
RGBA_Font *fn;
RGBA_Font_Int *fi;
-
+
fi = evas_common_font_int_memory_load(name, size, data, data_size);
if (!fi) return NULL;
fn = calloc(1, sizeof(RGBA_Font));
@@ -288,8 +289,8 @@
fi = evas_common_font_int_load(name, size);
if (!fi) return NULL;
-
- /* First font, complete load */
+
+ /* First font, complete load */
if (!fi->ft.size)
{
if (!fi->src->ft.face)
@@ -307,12 +308,12 @@
}
evas_common_font_int_load_complete(fi);
}
-
+
fn = calloc(1, sizeof(RGBA_Font));
if (!fn)
{
- fi->references--;
- if (fi->references == 0)
+ fi->references--;
+ if (fi->references == 0)
{
evas_common_font_int_modify_cache_by(fi, 1);
evas_common_font_flush();
@@ -391,7 +392,7 @@
evas_common_font_hinting_set(RGBA_Font *fn, Font_Hint_Flags hinting)
{
Evas_List *l;
-
+
if (!fn)
return;
fn->hinting = hinting;
@@ -492,8 +493,8 @@
}
/* when the fi->references == 0 we increase this instead of really deleting
- * we then check if the cache_useage size is larger than allowed
- * !If the cache is NOT too large we dont delete font_int
+ * we then check if the cache_useage size is larger than allowed
+ * !If the cache is NOT too large we dont delete font_int
* !If the cache is too large we really delete font_int */
EAPI void
evas_common_font_int_modify_cache_by(RGBA_Font_Int *fi, int dir)
@@ -594,4 +595,3 @@
}
return NULL;
}
-
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/lib/engines/common/evas_font_draw.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -3 -r1.35 -r1.36
--- evas_font_draw.c 12 Apr 2008 00:32:25 -0000 1.35
+++ evas_font_draw.c 10 Jul 2008 18:08:18 -0000 1.36
@@ -1,3 +1,7 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+
#include "evas_common.h"
EAPI RGBA_Font_Glyph *
@@ -9,9 +13,9 @@
FT_Error error;
const FT_Int32 hintflags[3] =
{ FT_LOAD_NO_HINTING, FT_LOAD_FORCE_AUTOHINT, FT_LOAD_NO_AUTOHINT };
-
+
hindex = index + (fi->hinting * 500000000);
-
+
key[0] = ((hindex ) & 0x7f) + 1;
key[1] = ((hindex >> 7 ) & 0x7f) + 1;
key[2] = ((hindex >> 14 ) & 0x7f) + 1;
@@ -21,7 +25,7 @@
fg = evas_hash_find(fi->glyphs, key);
if (fg) return fg;
-
+
// error = FT_Load_Glyph(fi->src->ft.face, index, FT_LOAD_NO_BITMAP);
error = FT_Load_Glyph(fi->src->ft.face, index,
FT_LOAD_RENDER | hintflags[fi->hinting]);
@@ -62,12 +66,12 @@
{
RGBA_Font_Int *fi;
int index;
-
+
fi = l->data;
if (fi->src->charmap) /* Charmap loaded, FI/FS blank */
{
- index = evas_common_array_hash_search(fi->src->charmap, gl);
+ index = evas_array_hash_search(fi->src->charmap, gl);
if (index != 0)
{
evas_common_font_source_load_complete(fi->src);
@@ -77,7 +81,7 @@
fi->src->charmap = NULL;
*fi_ret = fi;
- return index;
+ return index;
}
}
else if (!fi->src->ft.face) /* Charmap not loaded, FI/FS blank */
@@ -91,7 +95,7 @@
/* Load Hash */
FT_ULong charcode;
FT_UInt gindex;
-
+
fi->src->charmap = evas_common_array_hash_new();
charcode = FT_Get_First_Char(fi->src->ft.face, &gindex);
while (gindex != 0)
@@ -99,7 +103,7 @@
evas_common_array_hash_add(fi->src->charmap, charcode,
gindex);
charcode = FT_Get_Next_Char(fi->src->ft.face, charcode,
&gindex);
}
-
+
/* Free face */
FT_Done_Face(fi->src->ft.face);
fi->src->ft.face = NULL;
@@ -107,20 +111,20 @@
else
{
evas_common_font_int_load_complete(fi);
-
+
*fi_ret = fi;
return index;
}
-#endif
+#endif
}
else /* Charmap not loaded, FS loaded */
{
index = FT_Get_Char_Index(fi->src->ft.face, gl);
if (index != 0)
{
- if (!fi->ft.size)
- evas_common_font_int_load_complete(fi);
-
+ if (!fi->ft.size)
+ evas_common_font_int_load_complete(fi);
+
*fi_ret = fi;
return index;
}
@@ -145,7 +149,7 @@
FT_Face pface = NULL;
fi = fn->fonts->data;
-
+
im = dst->image.data;
im_w = dst->cache_entry.w;
im_h = dst->cache_entry.h;
@@ -228,7 +232,7 @@
w = fg->glyph_out->bitmap.width;
if (j < w) j = w;
h = fg->glyph_out->bitmap.rows;
-/*
+/*
if ((fg->glyph_out->bitmap.pixel_mode == ft_pixel_mode_grays)
&& (fg->glyph_out->bitmap.num_grays == 256)
)
@@ -255,7 +259,7 @@
{
int dx, dy;
int in_x, in_w;
-
+
in_x = 0;
in_w = 0;
dx = chr_x;
@@ -290,13 +294,13 @@
DATA8 *tmpbuf = NULL, *dp, *tp, bits;
int bi, bj;
const DATA8 bitrepl[2] = {0x0, 0xff};
-
+
tmpbuf = alloca(w);
for (i = 0; i < h; i++)
{
int dx, dy;
int in_x, in_w, end;
-
+
in_x = 0;
in_w = 0;
dx = chr_x;
-------------------------------------------------------------------------
Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW!
Studies have shown that voting for your favorite open source project,
along with a healthy diet, reduces your potential for chronic lameness
and boredom. Vote Now at http://www.sourceforge.net/community/cca08
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
