diff options
| author |  vandebo@chromium.org <vandebo@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-12-10 17:22:41 +0000 |
|---|---|---|
| committer | vandebo@chromium.org <vandebo@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-12-10 17:22:41 +0000 |
| commit | 5f209e64057e607e260c9bb4fee02d16c5f35f98 (patch) | |
| tree | 806eafe0e18d59e19a9a261f321f68063b2bc0de /src/core/SkTypeface.cpp | |
| parent | 7ad9368687f6132e39ea6b49065e6450e927dcb5 (diff) | |
Revert "[PDF] Fix font embedding restrictions."
This reverts r12600 and r12601, likely causing crash on Mac.
Review URL: https://codereview.chromium.org/111893002
git-svn-id: http://skia.googlecode.com/svn/trunk@12604 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/core/SkTypeface.cpp')
| -rw-r--r-- | src/core/SkTypeface.cpp | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/src/core/SkTypeface.cpp b/src/core/SkTypeface.cpp index e419391b2d..09a64324af 100644 --- a/src/core/SkTypeface.cpp +++ b/src/core/SkTypeface.cpp @@ -6,10 +6,8 @@ */ #include "SkAdvancedTypefaceMetrics.h" -#include "SkEndian.h" #include "SkFontDescriptor.h" #include "SkFontHost.h" -#include "SkOTTable_OS_2.h" #include "SkStream.h" #include "SkTypeface.h" @@ -261,26 +259,7 @@ SkAdvancedTypefaceMetrics* SkTypeface::getAdvancedTypefaceMetrics( SkAdvancedTypefaceMetrics::PerGlyphInfo info, const uint32_t* glyphIDs, uint32_t glyphIDsCount) const { - SkAdvancedTypefaceMetrics* result = - this->onGetAdvancedTypefaceMetrics(info, glyphIDs, glyphIDsCount); - if (result && result->fType == SkAdvancedTypefaceMetrics::kTrueType_Font) { - struct SkOTTableOS2 os2table; - if (this->getTableData(SkEndian_SwapBE32(SkOTTableOS2::TAG), 0, - sizeof(os2table), &os2table) > 0) { - if (os2table.version.v2.fsType.field.Restricted || - os2table.version.v2.fsType.field.Bitmap) { - result->fFlags = SkTBitOr<SkAdvancedTypefaceMetrics::FontFlags>( - result->fFlags, - SkAdvancedTypefaceMetrics::kNotEmbeddable_FontFlag); - } - if (os2table.version.v2.fsType.field.NoSubsetting) { - result->fFlags = SkTBitOr<SkAdvancedTypefaceMetrics::FontFlags>( - result->fFlags, - SkAdvancedTypefaceMetrics::kNotSubsettable_FontFlag); - } - } - } - return result; + return this->onGetAdvancedTypefaceMetrics(info, glyphIDs, glyphIDsCount); } /////////////////////////////////////////////////////////////////////////////// |