Author: vince Date: Fri Feb 27 03:56:02 2009 New Revision: 6655 URL: http://source.netsurf-browser.org?rev=6655&view=rev Log: Improve freetype build integration (from hiyuh) Improve error checking on font initialization Modified: trunk/netsurf/Makefile trunk/netsurf/framebuffer/fb_font_freetype.c trunk/netsurf/framebuffer/fb_gui.c Modified: trunk/netsurf/Makefile URL: http://source.netsurf-browser.org/trunk/netsurf/Makefile?rev=6655&r1=... ============================================================================== --- trunk/netsurf/Makefile (original) +++ trunk/netsurf/Makefile Fri Feb 27 03:56:02 2009 @@ -470,8 +470,8 @@ $(eval $(call feature_enabled,MNG,-DWITH_MNG,-lmng,PNG support)) ifeq ($(NETSURF_FB_FONTLIB),freetype) - CFLAGS += -DFB_USE_FREETYPE -I/usr/include/freetype2 - LDFLAGS += -lfreetype + CFLAGS += -DFB_USE_FREETYPE $(shell freetype-config --cflags) + LDFLAGS += $(shell freetype-config --libs) endif # define additional CFLAGS and LDFLAGS requirements for pkg-configed libs here Modified: trunk/netsurf/framebuffer/fb_font_freetype.c URL: http://source.netsurf-browser.org/trunk/netsurf/framebuffer/fb_font_freet... ============================================================================== --- trunk/netsurf/framebuffer/fb_font_freetype.c (original) +++ trunk/netsurf/framebuffer/fb_font_freetype.c Fri Feb 27 03:56:02 2009 @@ -99,7 +99,7 @@ FT_Face aface; newf = calloc(1, sizeof(fb_faceid_t)); - newf->fontfile=strdup(fontfile); + newf->fontfile = strdup(fontfile); error = FTC_Manager_LookupFace(ft_cmanager, (FTC_FaceID)newf, &aface); if (error) { @@ -149,6 +149,7 @@ fb_face_sans_serif = fb_new_face("/usr/share/fonts/truetype/ttf-bitstream-vera/Vera.ttf"); if (fb_face_sans_serif == NULL) { LOG(("Could not find default font (code %d)\n", error)); + FTC_Manager_Done(ft_cmanager ); FT_Done_FreeType(library); return false; } Modified: trunk/netsurf/framebuffer/fb_gui.c URL: http://source.netsurf-browser.org/trunk/netsurf/framebuffer/fb_gui.c?rev=... ============================================================================== --- trunk/netsurf/framebuffer/fb_gui.c (original) +++ trunk/netsurf/framebuffer/fb_gui.c Fri Feb 27 03:56:02 2009 @@ -260,12 +260,13 @@ default: LOG(("Unsupported bit depth (%d)", framebuffer->bpp)); - exit(1); + die("Unsupported bit depth"); } framebuffer->cursor = fb_cursor_init(framebuffer, &pointer_image); - fb_font_init(); + if (fb_font_init() == false) + die("Unable to initialise the font system"); }