diff options
| author | Nicolas Pena <npm@chromium.org> | 2017-03-20 15:20:58 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-03-20 20:05:03 +0000 |
| commit | 35292ad2070aa3cabdef4ea23ffaaf38e1a7de3a (patch) | |
| tree | 0d651eb2e571c9f881826d4e2744ae9f7ac935e1 /core/fpdfapi/page | |
| parent | 20df310406636d19a3238ea300bf303a7cd44d2e (diff) | |
| download | pdfium-35292ad2070aa3cabdef4ea23ffaaf38e1a7de3a.tar.xz | |
Allow processing fonts with indirect dict
BUG=pdfium:667
Change-Id: I6e7620948086f3f620e4cde778a4144570e1bd6d
Reviewed-on: https://pdfium-review.googlesource.com/3106
Reviewed-by: dsinclair <dsinclair@chromium.org>
Commit-Queue: Nicolás Peña <npm@chromium.org>
Diffstat (limited to 'core/fpdfapi/page')
| -rw-r--r-- | core/fpdfapi/page/cpdf_page.cpp | 4 | ||||
| -rw-r--r-- | core/fpdfapi/page/cpdf_page.h | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/core/fpdfapi/page/cpdf_page.cpp b/core/fpdfapi/page/cpdf_page.cpp index 46123ab42e..314b8acbaa 100644 --- a/core/fpdfapi/page/cpdf_page.cpp +++ b/core/fpdfapi/page/cpdf_page.cpp @@ -183,5 +183,7 @@ bool GraphicsData::operator<(const GraphicsData& other) const { } bool FontData::operator<(const FontData& other) const { - return baseFont < other.baseFont; + if (baseFont != other.baseFont) + return baseFont < other.baseFont; + return type < other.type; } diff --git a/core/fpdfapi/page/cpdf_page.h b/core/fpdfapi/page/cpdf_page.h index 76587d8c32..076ab3f93b 100644 --- a/core/fpdfapi/page/cpdf_page.h +++ b/core/fpdfapi/page/cpdf_page.h @@ -31,6 +31,7 @@ struct GraphicsData { struct FontData { CFX_ByteString baseFont; + CFX_ByteString type; bool operator<(const FontData& other) const; }; |