From 88037f476f43354725e4fb06e36b56128f33cd5a Mon Sep 17 00:00:00 2001 From: Ethan Yonker Date: Sun, 4 Oct 2015 22:09:08 -0500 Subject: Remove support for non-TTF fonts This patch set removes support in TWRP for the old .dat file format as well as support for the AOSP style fonts in header files. We need TTF for scaling. Note that the old AOSP style header font is still supported in minui which is not used by TWRP. Change-Id: I6124a3333d479f1fc668138f7e32c4be9b519552 --- minuitwrp/minui.h | 8 -------- 1 file changed, 8 deletions(-) (limited to 'minuitwrp/minui.h') diff --git a/minuitwrp/minui.h b/minuitwrp/minui.h index 6033da728..1744928dd 100644 --- a/minuitwrp/minui.h +++ b/minuitwrp/minui.h @@ -21,10 +21,7 @@ typedef void* gr_surface; typedef unsigned short gr_pixel; #define FONT_TYPE_TWRP 0 - -#ifndef TW_DISABLE_TTF #define FONT_TYPE_TTF 1 -#endif int gr_init(void); void gr_exit(void); @@ -52,10 +49,6 @@ int gr_maxExW(const char *s, void* font, int max_width); int gr_getMaxFontHeight(void *font); -void* gr_loadFont(const char* fontName); -void gr_freeFont(void *font); - -#ifndef TW_DISABLE_TTF void *gr_ttf_loadFont(const char *filename, int size, int dpi); void gr_ttf_freeFont(void *font); int gr_ttf_textExWH(void *context, int x, int y, const char *s, void *pFont, int max_width, int max_height); @@ -63,7 +56,6 @@ int gr_ttf_measureEx(const char *s, void *font); int gr_ttf_maxExW(const char *s, void *font, int max_width); int gr_ttf_getMaxFontHeight(void *font); void gr_ttf_dump_stats(void); -#endif void gr_blit(gr_surface source, int sx, int sy, int w, int h, int dx, int dy); unsigned int gr_get_width(gr_surface surface); -- cgit v1.2.3