From 8a5d692c034b4f027391b4e659c7562714f62804 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Mon, 14 Mar 2011 15:08:03 +0000 Subject: [PATCH] work around linker-error when building on the Mac git-svn-id: http://skia.googlecode.com/svn/trunk@930 2bbb7eff-a529-9590-31e7-b0007b416f81 --- src/ports/SkFontHost_FreeType.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/ports/SkFontHost_FreeType.cpp b/src/ports/SkFontHost_FreeType.cpp index 5fb3245..96cdcca 100644 --- a/src/ports/SkFontHost_FreeType.cpp +++ b/src/ports/SkFontHost_FreeType.cpp @@ -346,6 +346,9 @@ static bool getWidthAdvance(FT_Face face, int gId, int16_t* data) { // static SkAdvancedTypefaceMetrics* SkFontHost::GetAdvancedTypefaceMetrics( uint32_t fontID, bool perGlyphInfo) { +#if defined(SK_BUILD_FOR_MAC) + return NULL; +#else SkAutoMutexAcquire ac(gFTMutex); FT_Library libInit = NULL; if (gFTCount == 0) { @@ -510,6 +513,7 @@ SkAdvancedTypefaceMetrics* SkFontHost::GetAdvancedTypefaceMetrics( unref_ft_face(face); return info; +#endif } /////////////////////////////////////////////////////////////////////////// -- 2.7.4