From 9ba6a147311eacb933c175168de6d11c439985d3 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Tue, 22 Dec 2015 14:57:45 -0800 Subject: Merge to XFA: Start using allowed C++11 features. TBR=dml@google.com, thakis@chromium.org Review URL: https://codereview.chromium.org/1544923002 . Review URL: https://codereview.chromium.org/1545823002 . (cherry picked from commit ba2586d2c0a50df14aa2549a0a841e1d4b9af4b6) (cherry picked from commit 87f7d29531dabfd66e547a6be31a08272ff631d5) Review URL: https://codereview.chromium.org/1542213002 . --- core/src/fxge/ge/fx_ge_fontmap.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'core/src/fxge/ge') diff --git a/core/src/fxge/ge/fx_ge_fontmap.cpp b/core/src/fxge/ge/fx_ge_fontmap.cpp index 6432397e04..4105e79a69 100644 --- a/core/src/fxge/ge/fx_ge_fontmap.cpp +++ b/core/src/fxge/ge/fx_ge_fontmap.cpp @@ -5,6 +5,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include +#include #include "core/include/fxge/fx_freetype.h" #include "core/include/fxge/fx_ge.h" @@ -711,7 +712,7 @@ CFX_ByteString CFX_FontMapper::GetPSNameFromTT(void* hFont) { return CFX_ByteString(); std::vector buffer(size); - uint8_t* buffer_ptr = pdfium::vector_as_array(&buffer); + uint8_t* buffer_ptr = buffer.data(); FX_DWORD bytes_read = m_pFontInfo->GetFontData(hFont, kTableNAME, buffer_ptr, size); return (bytes_read == size) ? GetNameFromTT(buffer_ptr, 6) : CFX_ByteString(); -- cgit v1.2.3