Index: core/src/fxge/ge/fx_ge_text.cpp |
diff --git a/core/src/fxge/ge/fx_ge_text.cpp b/core/src/fxge/ge/fx_ge_text.cpp |
index 6cc9790e569647bc74f9ed3e7de28961f8830875..4b36fc58246940291530611ceee188ac10ef3054 100644 |
--- a/core/src/fxge/ge/fx_ge_text.cpp |
+++ b/core/src/fxge/ge/fx_ge_text.cpp |
@@ -12,6 +12,7 @@ |
#undef FX_GAMMA_INVERSE |
#define FX_GAMMA(value) (value) |
#define FX_GAMMA_INVERSE(value) (value) |
+#ifndef PDF_ENABLE_XFA |
namespace { |
@@ -39,6 +40,7 @@ class ScopedFontTransform { |
}; |
} |
+#endif |
FX_RECT FXGE_GetGlyphsBBox(FXTEXT_GLYPHPOS* pGlyphAndPos, |
int nChars, |
int anti_alias, |
@@ -1180,7 +1182,9 @@ CFX_FaceCache* CFX_FontCache::GetCachedFace(CFX_Font* pFont) { |
counted_face_cache->m_nCount++; |
return counted_face_cache->m_Obj; |
} |
+#ifndef PDF_ENABLE_XFA |
+#endif |
CFX_FaceCache* face_cache = new CFX_FaceCache(bExternal ? nullptr : face); |
CFX_CountedFaceCache* counted_face_cache = new CFX_CountedFaceCache; |
counted_face_cache->m_nCount = 2; |
@@ -1550,7 +1554,11 @@ CFX_GlyphBitmap* CFX_FaceCache::RenderGlyph(CFX_Font* pFont, |
pFont->GetSubstFont()->m_Weight); |
} |
} |
+#ifndef PDF_ENABLE_XFA |
ScopedFontTransform scoped_transform(m_Face, &ft_matrix); |
+#else |
+ FXFT_Set_Transform(m_Face, &ft_matrix, 0); |
+#endif |
int load_flags = (m_Face->face_flags & FT_FACE_FLAG_SFNT) |
? FXFT_LOAD_NO_BITMAP |
: (FXFT_LOAD_NO_BITMAP | FT_LOAD_NO_HINTING); |
@@ -1817,7 +1825,11 @@ CFX_PathData* CFX_Font::LoadGlyphPath(FX_DWORD glyph_index, int dest_width) { |
AdjustMMParams(glyph_index, dest_width, m_pSubstFont->m_Weight); |
} |
} |
+#ifndef PDF_ENABLE_XFA |
ScopedFontTransform scoped_transform(m_Face, &ft_matrix); |
+#else |
+ FXFT_Set_Transform(m_Face, &ft_matrix, 0); |
+#endif |
int load_flags = FXFT_LOAD_NO_BITMAP; |
if (!(m_Face->face_flags & FT_FACE_FLAG_SFNT) || !FT_IS_TRICKY(m_Face)) { |
load_flags |= FT_LOAD_NO_HINTING; |