diff options
Diffstat (limited to 'core/src/fxge/ge')
-rw-r--r-- | core/src/fxge/ge/fx_ge.cpp | 2 | ||||
-rw-r--r-- | core/src/fxge/ge/fx_ge_font.cpp | 2 | ||||
-rw-r--r-- | core/src/fxge/ge/fx_ge_fontmap.cpp | 2 | ||||
-rw-r--r-- | core/src/fxge/ge/fx_ge_linux.cpp | 2 | ||||
-rw-r--r-- | core/src/fxge/ge/fx_ge_ps.cpp | 3 | ||||
-rw-r--r-- | core/src/fxge/ge/fx_ge_text.cpp | 2 | ||||
-rw-r--r-- | core/src/fxge/ge/fx_text_int.h (renamed from core/src/fxge/ge/text_int.h) | 6 |
7 files changed, 10 insertions, 9 deletions
diff --git a/core/src/fxge/ge/fx_ge.cpp b/core/src/fxge/ge/fx_ge.cpp index f7787cf22c..d310a3f372 100644 --- a/core/src/fxge/ge/fx_ge.cpp +++ b/core/src/fxge/ge/fx_ge.cpp @@ -6,7 +6,7 @@ #include "core/include/fxge/fx_ge.h" -#include "text_int.h" +#include "core/src/fxge/ge/fx_text_int.h" static CFX_GEModule* g_pGEModule = NULL; CFX_GEModule::CFX_GEModule(const char** pUserFontPaths) { diff --git a/core/src/fxge/ge/fx_ge_font.cpp b/core/src/fxge/ge/fx_ge_font.cpp index 56e178f985..672c28d86b 100644 --- a/core/src/fxge/ge/fx_ge_font.cpp +++ b/core/src/fxge/ge/fx_ge_font.cpp @@ -6,7 +6,7 @@ #include "core/include/fxge/fx_freetype.h" #include "core/include/fxge/fx_ge.h" -#include "text_int.h" +#include "core/src/fxge/ge/fx_text_int.h" #define EM_ADJUST(em, a) (em == 0 ? (a) : (a)*1000 / em) diff --git a/core/src/fxge/ge/fx_ge_fontmap.cpp b/core/src/fxge/ge/fx_ge_fontmap.cpp index be71f6bfac..f624d5abd6 100644 --- a/core/src/fxge/ge/fx_ge_fontmap.cpp +++ b/core/src/fxge/ge/fx_ge_fontmap.cpp @@ -10,7 +10,7 @@ #include "core/include/fxge/fx_freetype.h" #include "core/include/fxge/fx_ge.h" #include "core/src/fxge/fontdata/chromefontdata/chromefontdata.h" -#include "core/src/fxge/ge/text_int.h" +#include "core/src/fxge/ge/fx_text_int.h" #include "third_party/base/stl_util.h" #define GET_TT_SHORT(w) (FX_WORD)(((w)[0] << 8) | (w)[1]) diff --git a/core/src/fxge/ge/fx_ge_linux.cpp b/core/src/fxge/ge/fx_ge_linux.cpp index d581627b7e..8ad5ff0da2 100644 --- a/core/src/fxge/ge/fx_ge_linux.cpp +++ b/core/src/fxge/ge/fx_ge_linux.cpp @@ -6,7 +6,7 @@ #include "core/include/fxge/fx_ge.h" #include "core/src/fxge/agg/include/fx_agg_driver.h" -#include "text_int.h" +#include "core/src/fxge/ge/fx_text_int.h" #if _FXM_PLATFORM_ == _FXM_PLATFORM_LINUX_ class CFX_LinuxFontInfo : public CFX_FolderFontInfo { diff --git a/core/src/fxge/ge/fx_ge_ps.cpp b/core/src/fxge/ge/fx_ge_ps.cpp index f9fd8dea30..d6f6089033 100644 --- a/core/src/fxge/ge/fx_ge_ps.cpp +++ b/core/src/fxge/ge/fx_ge_ps.cpp @@ -5,8 +5,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "core/include/fxge/fx_ge.h" + #include "core/include/fxcodec/fx_codec.h" -#include "text_int.h" +#include "core/src/fxge/ge/fx_text_int.h" struct PSGlyph { CFX_Font* m_pFont; diff --git a/core/src/fxge/ge/fx_ge_text.cpp b/core/src/fxge/ge/fx_ge_text.cpp index 0ed0bbbbd6..7dbeac3316 100644 --- a/core/src/fxge/ge/fx_ge_text.cpp +++ b/core/src/fxge/ge/fx_ge_text.cpp @@ -7,7 +7,7 @@ #include "core/include/fxge/fx_ge.h" #include "core/include/fxge/fx_freetype.h" #include "core/include/fxcodec/fx_codec.h" -#include "text_int.h" +#include "core/src/fxge/ge/fx_text_int.h" #undef FX_GAMMA #undef FX_GAMMA_INVERSE diff --git a/core/src/fxge/ge/text_int.h b/core/src/fxge/ge/fx_text_int.h index 5a691671be..b568b61a54 100644 --- a/core/src/fxge/ge/text_int.h +++ b/core/src/fxge/ge/fx_text_int.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef CORE_SRC_FXGE_GE_TEXT_INT_H_ -#define CORE_SRC_FXGE_GE_TEXT_INT_H_ +#ifndef CORE_SRC_FXGE_GE_FX_TEXT_INT_H_ +#define CORE_SRC_FXGE_GE_FX_TEXT_INT_H_ #include <map> @@ -81,4 +81,4 @@ class CFX_FontFaceInfo { FX_DWORD m_Charsets; }; -#endif // CORE_SRC_FXGE_GE_TEXT_INT_H_ +#endif // CORE_SRC_FXGE_GE_FX_TEXT_INT_H_ |