diff options
| -rw-r--r-- | src/pdf/SkPDFFont.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/pdf/SkPDFFont.cpp b/src/pdf/SkPDFFont.cpp index fe55c8d046..5d358cb3e7 100644 --- a/src/pdf/SkPDFFont.cpp +++ b/src/pdf/SkPDFFont.cpp @@ -759,7 +759,6 @@ SkPDFFont* SkPDFFont::GetFontResource(SkTypeface* typeface, uint16_t glyphID) { SkPDFDict* relatedFontDescriptor = NULL; if (relatedFontIndex >= 0) { SkPDFFont* relatedFont = CanonicalFonts()[relatedFontIndex].fFont; - SkASSERT(relatedFont->fFontInfo.get()); fontMetrics = relatedFont->fontInfo(); relatedFontDescriptor = relatedFont->getFontDescriptor(); } else { @@ -775,7 +774,8 @@ SkPDFFont* SkPDFFont::GetFontResource(SkTypeface* typeface, uint16_t glyphID) { SkFontHost::GetAdvancedTypefaceMetrics(fontID, info, NULL, 0); #if defined (SK_SFNTLY_SUBSETTER) SkSafeUnref(fontMetrics.get()); // SkRefPtr and Get both took a ref. - if (fontMetrics->fType != SkAdvancedTypefaceMetrics::kTrueType_Font) { + if (fontMetrics && + fontMetrics->fType != SkAdvancedTypefaceMetrics::kTrueType_Font) { // Font does not support subsetting, get new info with advance. info = SkTBitOr<SkAdvancedTypefaceMetrics::PerGlyphInfo>( info, SkAdvancedTypefaceMetrics::kHAdvance_PerGlyphInfo); |