From 35292ad2070aa3cabdef4ea23ffaaf38e1a7de3a Mon Sep 17 00:00:00 2001 From: Nicolas Pena Date: Mon, 20 Mar 2017 15:20:58 -0400 Subject: Allow processing fonts with indirect dict MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit BUG=pdfium:667 Change-Id: I6e7620948086f3f620e4cde778a4144570e1bd6d Reviewed-on: https://pdfium-review.googlesource.com/3106 Reviewed-by: dsinclair Commit-Queue: Nicolás Peña --- core/fpdfapi/page/cpdf_page.cpp | 4 +++- core/fpdfapi/page/cpdf_page.h | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'core/fpdfapi/page') 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; }; -- cgit v1.2.3