| Index: core/src/fxge/android/fpf_skiafont.cpp
|
| diff --git a/core/src/fxge/android/fpf_skiafont.cpp b/core/src/fxge/android/fpf_skiafont.cpp
|
| index 81d59a0707a345550cec2f7a60f8d07ecf7b74a0..ba0c40a4f4fdd7d991ea68bdfda3c9a49477f8b3 100644
|
| --- a/core/src/fxge/android/fpf_skiafont.cpp
|
| +++ b/core/src/fxge/android/fpf_skiafont.cpp
|
| @@ -4,14 +4,18 @@
|
|
|
| // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
|
|
|
| -#include "core/src/fxge/android/fx_fpf.h"
|
| +#include "core/include/fxcrt/fx_system.h"
|
| +
|
| +#if _FX_OS_ == _FX_ANDROID_
|
|
|
| #include <algorithm>
|
|
|
| -#if _FX_OS_ == _FX_ANDROID_
|
| +#include "core/include/fxge/fx_freetype.h"
|
| #include "core/src/fxge/android/fpf_skiafont.h"
|
| #include "core/src/fxge/android/fpf_skiafontmgr.h"
|
| +
|
| #define FPF_EM_ADJUST(em, a) (em == 0 ? (a) : (a)*1000 / em)
|
| +
|
| CFPF_SkiaFont::CFPF_SkiaFont()
|
| : m_pFontMgr(NULL),
|
| m_pFontDes(NULL),
|
|
|