diff options
| author | Sebastian Rasmussen <sebras@hotmail.com> | 2009-07-04 17:50:18 +0200 |
|---|---|---|
| committer | Sebastian Rasmussen <sebras@hotmail.com> | 2009-07-04 17:50:18 +0200 |
| commit | 9221d52240c936c411b17c21d50d987f94c26465 (patch) | |
| tree | d669818dada8bf61789242bd2c1af3e96d261deb | |
| parent | 5c8278009303064c2ba0c2e436448ee8670b53c7 (diff) | |
| download | mupdf-9221d52240c936c411b17c21d50d987f94c26465.tar.xz | |
Finalize freetype when no fonts refers to it.
| -rw-r--r-- | fitz/res_font.c | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/fitz/res_font.c b/fitz/res_font.c index 7eae1878..42f5595d 100644 --- a/fitz/res_font.c +++ b/fitz/res_font.c @@ -5,6 +5,8 @@ #include <ft2build.h> #include FT_FREETYPE_H +static void fz_finalizefreetype(void); + static fz_font * fz_newfont(void) { @@ -57,6 +59,7 @@ fz_dropfont(fz_font *font) if (font->ftface) { FT_Done_Face((FT_Face)font->ftface); + fz_finalizefreetype(); } fz_free(font); @@ -77,6 +80,7 @@ fz_setfontbbox(fz_font *font, int xmin, int ymin, int xmax, int ymax) */ static FT_Library fz_ftlib = nil; +static int fz_ftlib_refs = 0; #undef __FTERRORS_H__ #define FT_ERRORDEF(e, v, s) { (e), (s) }, @@ -112,7 +116,10 @@ fz_initfreetype(void) int maj, min, pat; if (fz_ftlib) + { + fz_ftlib_refs++; return fz_okay; + } code = FT_Init_FreeType(&fz_ftlib); if (code) @@ -120,11 +127,25 @@ fz_initfreetype(void) FT_Library_Version(fz_ftlib, &maj, &min, &pat); if (maj == 2 && min == 1 && pat < 7) + { + FT_Done_FreeType(fz_ftlib); return fz_throw("freetype version too old: %d.%d.%d", maj, min, pat); + } + fz_ftlib_refs++; return fz_okay; } +static void +fz_finalizefreetype(void) +{ + if (--fz_ftlib_refs == 0) + { + FT_Done_FreeType(fz_ftlib); + fz_ftlib = nil; + } +} + fz_error fz_newfontfromfile(fz_font **fontp, char *path, int index) { |