diff options
| author |  djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-04-15 14:37:28 +0000 |
|---|---|---|
| committer | djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-04-15 14:37:28 +0000 |
| commit | 856b984c51f19e8d7bebe0f06e21972233e78f1a (patch) | |
| tree | 5ad96d9fc12673d9ebfb953a7afd4823836535e7 /src/core | |
| parent | f41ca79112732abbea323b2653368fae5eda46db (diff) | |
Remove freetype dependency from core.gyp
Committed: https://code.google.com/p/skia/source/detail?r=8677
Review URL: https://codereview.chromium.org/13975014
git-svn-id: http://skia.googlecode.com/svn/trunk@8678 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/SkAdvancedTypefaceMetrics.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/core/SkAdvancedTypefaceMetrics.cpp b/src/core/SkAdvancedTypefaceMetrics.cpp index fb1325cc69..defe68c8a1 100644 --- a/src/core/SkAdvancedTypefaceMetrics.cpp +++ b/src/core/SkAdvancedTypefaceMetrics.cpp @@ -16,9 +16,10 @@ SK_DEFINE_INST_COUNT(SkAdvancedTypefaceMetrics) #include <dwrite.h> #endif -#if defined(SK_BUILD_FOR_NACL) -#include <ft2build.h> -#include FT_FREETYPE_H +#if defined(SK_BUILD_FOR_UNIX) || defined(SK_BUILD_FOR_ANDROID) +// forward declare structs needed for getAdvanceData() template for freetype +struct FT_FaceRec; +typedef struct FT_FaceRec_* FT_Face; #endif #ifdef SK_BUILD_FOR_MAC @@ -268,8 +269,6 @@ template SkAdvancedTypefaceMetrics::WidthRange* getAdvanceData( uint32_t subsetGlyphIDsLength, bool (*getAdvance)(IDWriteFontFace* fontFace, int gId, int16_t* data)); #elif defined(SK_BUILD_FOR_UNIX) || defined(SK_BUILD_FOR_ANDROID) -struct FT_FaceRec; -typedef struct FT_FaceRec_* FT_Face; template SkAdvancedTypefaceMetrics::WidthRange* getAdvanceData( FT_Face face, int num_glyphs, |