| Index: core/fpdfapi/fpdf_font/fpdf_font.cpp
|
| diff --git a/core/src/fpdfapi/fpdf_font/fpdf_font.cpp b/core/fpdfapi/fpdf_font/fpdf_font.cpp
|
| similarity index 99%
|
| rename from core/src/fpdfapi/fpdf_font/fpdf_font.cpp
|
| rename to core/fpdfapi/fpdf_font/fpdf_font.cpp
|
| index ae6ebdd9f89aa9c702e4e41aac80f8a836a9dbbe..98411ef0f150a97f1df9ee06ee76ab6ca211c0a0 100644
|
| --- a/core/src/fpdfapi/fpdf_font/fpdf_font.cpp
|
| +++ b/core/fpdfapi/fpdf_font/fpdf_font.cpp
|
| @@ -4,8 +4,9 @@
|
|
|
| // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
|
|
|
| -#include "core/src/fpdfapi/fpdf_font/font_int.h"
|
| +#include "core/fpdfapi/fpdf_font/font_int.h"
|
|
|
| +#include "core/fpdfapi/fpdf_page/pageint.h"
|
| #include "core/include/fpdfapi/cpdf_array.h"
|
| #include "core/include/fpdfapi/cpdf_dictionary.h"
|
| #include "core/include/fpdfapi/cpdf_document.h"
|
| @@ -18,11 +19,10 @@
|
| #include "core/include/fpdfapi/fpdf_resource.h"
|
| #include "core/include/fxcrt/fx_ext.h"
|
| #include "core/include/fxge/fx_freetype.h"
|
| -#include "core/src/fpdfapi/fpdf_page/pageint.h"
|
| #include "third_party/base/stl_util.h"
|
|
|
| #if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
|
| -#include "core/src/fxge/apple/apple_int.h"
|
| +#include "core/fxge/apple/apple_int.h"
|
| #endif
|
|
|
| namespace {
|
| @@ -138,8 +138,7 @@ CPDF_FontGlobals::CPDF_FontGlobals() {
|
| FXSYS_memset(m_EmbeddedToUnicodes, 0, sizeof(m_EmbeddedToUnicodes));
|
| }
|
|
|
| -CPDF_FontGlobals::~CPDF_FontGlobals() {
|
| -}
|
| +CPDF_FontGlobals::~CPDF_FontGlobals() {}
|
|
|
| CPDF_Font* CPDF_FontGlobals::Find(CPDF_Document* pDoc, int index) {
|
| auto it = m_StockMap.find(pDoc);
|
|
|