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

* evas_font_dir: Add all guards. 

SVN revision: 44446
This commit is contained in:
Cedric BAIL 2009-12-14 17:55:26 +00:00
parent 6ade2a3f68
commit b83490725c
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
legacy/evas/src/lib/canvas/evas_font_dir.c
View File

@ -130,8 +130,10 @@ evas_fonts_zero_free(Evas *evas)
if (fd->name) eina_stringshare_del(fd->name);
if (fd->source) eina_stringshare_del(fd->source);
evas->engine.func->font_free(evas->engine.data.output, fd->font);
#ifdef HAVE_FONTCONFIG
if (fd->set) FcFontSetDestroy(fd->set);
if (fd->p_nm) FcPatternDestroy(fd->p_nm);
#endif
free(fd);
}
}
@ -152,8 +154,10 @@ evas_fonts_zero_presure(Evas *evas)
if (fd->name) eina_stringshare_del(fd->name);
if (fd->source) eina_stringshare_del(fd->source);
evas->engine.func->font_free(evas->engine.data.output, fd->font);
#ifdef HAVE_FONTCONFIG
if (fd->set) FcFontSetDestroy(fd->set);
if (fd->p_nm) FcPatternDestroy(fd->p_nm);
#endif
free(fd);
if (eina_list_count(fonts_zero) < 5) break;
@ -190,8 +194,10 @@ evas_font_free(Evas *evas, void *font)
if (fd->name) eina_stringshare_del(fd->name);
if (fd->source) eina_stringshare_del(fd->source);
evas->engine.func->font_free(evas->engine.data.output, fd->font);
#ifdef HAVE_FONTCONFIG
if (fd->set) FcFontSetDestroy(fd->set);
if (fd->p_nm) FcPatternDestroy(fd->p_nm);
#endif
free(fd);
if (eina_list_count(fonts_zero) < 43) break;
@ -214,6 +220,7 @@ evas_font_init(void)
#endif
}
#ifdef HAVE_FONTCONFIG
static void *
evas_load_fontconfig(Evas *evas, FcFontSet *set, int size)
{
@ -235,6 +242,7 @@ evas_load_fontconfig(Evas *evas, FcFontSet *set, int size)
return font;
}
#endif
void *
evas_font_load(Evas *evas, const char *name, const char *source, int size)
@ -267,11 +275,13 @@ evas_font_load(Evas *evas, const char *name, const char *source, int size)
fd->ref++;
return fd->font;
}
#ifdef HAVE_FONTCONFIG
else if (fd->set && fd->p_nm)
{
font = evas_load_fontconfig(evas, fd->set, size);
goto on_find;
}
#endif
}
}
}
@ -290,11 +300,13 @@ evas_font_load(Evas *evas, const char *name, const char *source, int size)
fd->ref++;
return fd->font;
}
#ifdef HAVE_FONTCONFIG
else if (fd->set && fd->p_nm)
{
font = evas_load_fontconfig(evas, fd->set, size);
goto on_find;
}
#endif
}
}
}