diff options
| author |  yangsu@google.com <yangsu@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-06-21 13:09:32 +0000 |
|---|---|---|
| committer | yangsu@google.com <yangsu@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-06-21 13:09:32 +0000 |
| commit | ccb74eabccf19f66b6bf31f4acae89b62baa16c3 (patch) | |
| tree | 3b139651321fff4d9646c5adcee031da2abc90be /src/core/SkAdvancedTypefaceMetrics.cpp | |
| parent | 2d54d06adc58f0a6372fb2a1b2eca832965b863c (diff) | |
Changed mac specific files to use ApplicationServices rather than Carbon
http://codereview.appspot.com/4644053/
git-svn-id: http://skia.googlecode.com/svn/trunk@1658 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/core/SkAdvancedTypefaceMetrics.cpp')
| -rw-r--r-- | src/core/SkAdvancedTypefaceMetrics.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/core/SkAdvancedTypefaceMetrics.cpp b/src/core/SkAdvancedTypefaceMetrics.cpp index 05d5c28e6a..d9022246bd 100644 --- a/src/core/SkAdvancedTypefaceMetrics.cpp +++ b/src/core/SkAdvancedTypefaceMetrics.cpp @@ -23,7 +23,12 @@ #endif #ifdef SK_BUILD_FOR_MAC -#include <Carbon/Carbon.h> +#import <ApplicationServices/ApplicationServices.h> +#endif + +#ifdef SK_BUILD_FOR_IOS +#include <CoreText/CoreText.h> +#include <CoreGraphics/CoreGraphics.h> #endif namespace skia_advanced_typeface_metrics_utils { @@ -146,7 +151,7 @@ template SkAdvancedTypefaceMetrics::WidthRange* getAdvanceData( FT_Face face, int num_glyphs, bool (*getAdvance)(FT_Face face, int gId, int16_t* data)); -#elif defined(SK_BUILD_FOR_MAC) +#elif defined(SK_BUILD_FOR_MAC) || defined(SK_BUILD_FOR_IOS) template SkAdvancedTypefaceMetrics::WidthRange* getAdvanceData( CTFontRef ctFont, int num_glyphs, |