diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2015-10-20 14:57:56 -0400 |
|---|---|---|
| committer | Dan Sinclair <dsinclair@chromium.org> | 2015-10-20 14:57:56 -0400 |
| commit | 39869b641511c882d78e17548293cdb458c36f38 (patch) | |
| tree | 6e7fee229f9c8a5d628c2dfe81b3e9848a9670d2 /core/src/fpdfapi/fpdf_font/fpdf_font.cpp | |
| parent | 19169dae5bf92813b7419793f61dfca8b4fb9124 (diff) | |
| download | pdfium-39869b641511c882d78e17548293cdb458c36f38.tar.xz | |
Revert "Revert "Add type cast definitions for CPDF_Dictionary.""
This reverts commit 937840e1722d1f2b77d80575d6e710d760662c9c.
Add type cast definitions for CPDF_Dictionary.
This CL adds ToCPDFDictionary type definitions and updates one file to use
instead of straight casts. I had to fix two places where we'd casted off the
constness of the original pointer.
BUG=pdfium:201
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1420583003 .
Diffstat (limited to 'core/src/fpdfapi/fpdf_font/fpdf_font.cpp')
| -rw-r--r-- | core/src/fpdfapi/fpdf_font/fpdf_font.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/core/src/fpdfapi/fpdf_font/fpdf_font.cpp b/core/src/fpdfapi/fpdf_font/fpdf_font.cpp index 7a57889a35..10ca3113e3 100644 --- a/core/src/fpdfapi/fpdf_font/fpdf_font.cpp +++ b/core/src/fpdfapi/fpdf_font/fpdf_font.cpp @@ -746,10 +746,11 @@ void CPDF_Font::LoadPDFEncoding(CPDF_Object* pEncoding, GetPredefinedEncoding(iBaseEncoding, bsEncoding); return; } - if (pEncoding->GetType() != PDFOBJ_DICTIONARY) { + + CPDF_Dictionary* pDict = pEncoding->AsDictionary(); + if (!pDict) return; - } - CPDF_Dictionary* pDict = (CPDF_Dictionary*)pEncoding; + if (iBaseEncoding != PDFFONT_ENCODING_ADOBE_SYMBOL && iBaseEncoding != PDFFONT_ENCODING_ZAPFDINGBATS) { CFX_ByteString bsEncoding = pDict->GetString(FX_BSTRC("BaseEncoding")); @@ -782,6 +783,7 @@ void CPDF_Font::LoadPDFEncoding(CPDF_Object* pEncoding, } } } + FX_BOOL CPDF_Font::IsStandardFont() const { if (m_FontType != PDFFONT_TYPE1) return FALSE; |