Evas font: Fixed a couple of warnings and formatting issues.

SVN revision: 51656
This commit is contained in:
Tom Hacohen 2010-08-26 11:45:45 +00:00
parent 07f7a9bd88
commit 26ecd94b4c
2 changed files with 6 additions and 6 deletions

View File

@ -64,7 +64,7 @@ evas_common_font_query_kerning(RGBA_Font_Int* fi,
*/
EAPI void
evas_common_font_query_size(RGBA_Font *fn, const Eina_Unicode *text, const Evas_BiDi_Props *intl_props, int *w, int *h)
evas_common_font_query_size(RGBA_Font *fn, const Eina_Unicode *text, const Evas_BiDi_Props *intl_props __UNUSED__, int *w, int *h)
{
int use_kerning;
int pen_x, pen_y;
@ -107,7 +107,7 @@ evas_common_font_query_size(RGBA_Font *fn, const Eina_Unicode *text, const Evas_
/* you want performance */
kern = 0;
if ((use_kerning) && (prev_index) && (index) &&
(pface == fi->src->ft.face) &&
(pface == fi->src->ft.face) &&
evas_common_font_query_kerning(fi, prev_index, index, &kern))
pen_x += kern;
@ -117,7 +117,7 @@ evas_common_font_query_size(RGBA_Font *fn, const Eina_Unicode *text, const Evas_
if (!fg) continue;
if (kern < 0) kern = 0;
/* We care about advancing the whole string size, and not the actual
* paint size of each string, so we only care about advancing correctly
* and not the actual glyph width */
@ -624,7 +624,7 @@ end:
*/
EAPI int
evas_common_font_query_last_up_to_pos(RGBA_Font *fn, const Eina_Unicode *in_text, const Evas_BiDi_Props *intl_props, int x, int y)
evas_common_font_query_last_up_to_pos(RGBA_Font *fn, const Eina_Unicode *in_text, const Evas_BiDi_Props *intl_props __UNUSED__, int x, int y)
{
int use_kerning;
int pen_x, pen_y;

View File

@ -850,8 +850,8 @@ struct _RGBA_Font_Source
void *data;
int data_size;
int current_size;
unsigned int current_size;
struct {
int orig_upem;
FT_Face face;