From b23246be8d4a9aba2943d5fd0b7d9b2342d73d1e Mon Sep 17 00:00:00 2001 From: Nicolas Pena Date: Thu, 5 Oct 2017 10:48:04 -0400 Subject: Roll FT to ae7dc1f62d826083d418e86cce3f66a76dff038a MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit List of changes: https://chromium.googlesource.com/chromium/src/third_party/freetype2.git/+log/7e50824288fa..ae7dc1f62d82 Bug: chromium:754574 pdfium:905 Change-Id: Ic7525eb5a4d5fab19bdc2ec7e625e0fc889c52a2 Reviewed-on: https://pdfium-review.googlesource.com/15370 Reviewed-by: dsinclair Commit-Queue: Nicolás Peña Moreno --- DEPS | 4 ++-- fpdfsdk/fpdfannot_embeddertest.cpp | 22 +++++++++++----------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/DEPS b/DEPS index 91a87004a8..a4d2470079 100644 --- a/DEPS +++ b/DEPS @@ -10,7 +10,7 @@ vars = { 'catapult_revision': '0cf3924bab2c2f66a412edda35f6e3572bd57623', 'clang_revision': '4db585405687222660050d58eb12784fe0852884', 'cygwin_revision': 'c89e446b273697fadf3a10ff1007a97c0b7de6df', - 'freetype_revision': '7e50824288fac5a36c2938fdb3e1c949ea53f982', + 'freetype_revision': 'ae7dc1f62d826083d418e86cce3f66a76dff038a', 'gmock_revision': '29763965ab52f24565299976b936d1265cb6a271', 'gtest_revision': '8245545b6dc9c4703e6496d1efd19e975ad2b038', 'icu_revision': '08cb956852a5ccdba7f9c941728bb833529ba3c6', @@ -18,7 +18,7 @@ vars = { 'jinja2_revision': 'd34383206fa42d52faa10bb9931d6d538f3a57e0', 'jpeg_turbo_revision': '7260e4d8b8e1e40b17f03fafdf1cd83296900f76', 'markupsafe_revision': '8f45f5cfa0009d2a70589bcda0349b8cb2b72783', - 'pdfium_tests_revision': '14606ac642de57bea9aae0d07aa76f5e0ac50dba', + 'pdfium_tests_revision': 'ae1650f5459d720c866a8a4b74f58529f3efc4f1', 'skia_revision': 'e0e20755f6c09b71038ced2bf4a00b4c4593f504', 'tools_memory_revision': '427f10475e1a8d72424c29d00bf689122b738e5d', 'trace_event_revision': '06294c8a4a6f744ef284cd63cfe54dbf61eea290', diff --git a/fpdfsdk/fpdfannot_embeddertest.cpp b/fpdfsdk/fpdfannot_embeddertest.cpp index 34643dfb48..b2cace9b16 100644 --- a/fpdfsdk/fpdfannot_embeddertest.cpp +++ b/fpdfsdk/fpdfannot_embeddertest.cpp @@ -492,10 +492,10 @@ TEST_F(FPDFAnnotEmbeddertest, AddAndModifyPath) { const char md5_two_paths[] = "67c7e90fc3b64e20f6b69a1744f7f4f0"; const char md5_new_annot[] = "262187984451bae2fe826067d68623ff"; #else - const char md5_original[] = "02e1c6adff8fee4aeabd91c2c2e4be43"; - const char md5_modified_path[] = "87a78cbacd8509b961a67be56b5665a2"; - const char md5_two_paths[] = "76e985c18b73ceacf409f77f978176d4"; - const char md5_new_annot[] = "c95de7a9a1f61faca03d953961a319b9"; + const char md5_original[] = "4f64add0190ede63f7bb9eb1e2e83edb"; + const char md5_modified_path[] = "681f0d0738dded0722e146f6c219bfac"; + const char md5_two_paths[] = "67c7e90fc3b64e20f6b69a1744f7f4f0"; + const char md5_new_annot[] = "262187984451bae2fe826067d68623ff"; #endif // Open a file with two annotations and load its first page. @@ -669,9 +669,9 @@ TEST_F(FPDFAnnotEmbeddertest, AddAndModifyImage) { const char md5_new_image[] = "6fb176c20996cc554d0210d8c8b6138f"; const char md5_modified_image[] = "546959714dfb0dcd7e7b00259e8d178c"; #else - const char md5_original[] = "02e1c6adff8fee4aeabd91c2c2e4be43"; - const char md5_new_image[] = "e7658232abd8977cdc3367dd02aee04a"; - const char md5_modified_image[] = "f393432b9a9b452ea69022f46c8b3f75"; + const char md5_original[] = "4f64add0190ede63f7bb9eb1e2e83edb"; + const char md5_new_image[] = "6fb176c20996cc554d0210d8c8b6138f"; + const char md5_modified_image[] = "546959714dfb0dcd7e7b00259e8d178c"; #endif // Open a file with two annotations and load its first page. @@ -748,9 +748,9 @@ TEST_F(FPDFAnnotEmbeddertest, AddAndModifyText) { const char md5_new_text[] = "998abae4962f8f41e094e7612d8339fc"; const char md5_modified_text[] = "e89b82ca4589b8f0b45fff42ca3a96a4"; #else - const char md5_original[] = "02e1c6adff8fee4aeabd91c2c2e4be43"; - const char md5_new_text[] = "3fbbaec4d846ccf2be89e09daae0273d"; - const char md5_modified_text[] = "2ad0acaf2d8990bcdf48e1d12e6c44ad"; + const char md5_original[] = "4f64add0190ede63f7bb9eb1e2e83edb"; + const char md5_new_text[] = "998abae4962f8f41e094e7612d8339fc"; + const char md5_modified_text[] = "e89b82ca4589b8f0b45fff42ca3a96a4"; #endif // Open a file with two annotations and load its first page. @@ -876,7 +876,7 @@ TEST_F(FPDFAnnotEmbeddertest, GetSetStringValue) { #elif _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_ const char md5[] = "0e3710ea6476f5bcba2cd39eb42d54e2"; #else - const char md5[] = "831a3c465a56d2e0c89aef7bdf15306a"; + const char md5[] = "0e3710ea6476f5bcba2cd39eb42d54e2"; #endif TestSaved(595, 842, md5); FPDF_ANNOTATION new_annot = FPDFPage_GetAnnot(m_SavedPage, 0); -- cgit v1.2.3