diff options
Diffstat (limited to 'core/fxge/apple/fx_apple_platform.cpp')
| -rw-r--r-- | core/fxge/apple/fx_apple_platform.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/core/fxge/apple/fx_apple_platform.cpp b/core/fxge/apple/fx_apple_platform.cpp index 239a6e50f9..be429e9a43 100644 --- a/core/fxge/apple/fx_apple_platform.cpp +++ b/core/fxge/apple/fx_apple_platform.cpp @@ -18,6 +18,7 @@ #include "core/fxge/ge/cfx_cliprgn.h" #include "core/fxge/ge/fx_text_int.h" #include "core/fxge/include/cfx_facecache.h" +#include "core/fxge/include/cfx_fontcache.h" #include "core/fxge/include/cfx_gemodule.h" #include "core/fxge/include/cfx_renderdevice.h" #include "core/fxge/include/fx_freetype.h" @@ -32,6 +33,7 @@ FX_BOOL CGDrawGlyphRun(CGContextRef pContext, int nChars, const FXTEXT_CHARPOS* pCharPos, CFX_Font* pFont, + CFX_FontCache* pCache, const CFX_Matrix* pObject2Device, FX_FLOAT font_size, uint32_t argb) { @@ -104,6 +106,7 @@ void CFX_AggDeviceDriver::DestroyPlatform() { FX_BOOL CFX_AggDeviceDriver::DrawDeviceText(int nChars, const FXTEXT_CHARPOS* pCharPos, CFX_Font* pFont, + CFX_FontCache* pCache, const CFX_Matrix* pObject2Device, FX_FLOAT font_size, uint32_t argb) { @@ -152,8 +155,8 @@ FX_BOOL CFX_AggDeviceDriver::DrawDeviceText(int nChars, else CGContextClipToRect(ctx, rect_cg); - FX_BOOL ret = CGDrawGlyphRun(ctx, nChars, pCharPos, pFont, pObject2Device, - font_size, argb); + FX_BOOL ret = CGDrawGlyphRun(ctx, nChars, pCharPos, pFont, pCache, + pObject2Device, font_size, argb); if (pImageCG) CGImageRelease(pImageCG); CGContextRestoreGState(ctx); @@ -167,7 +170,7 @@ void CFX_FaceCache::InitPlatform() {} void CFX_FaceCache::DestroyPlatform() {} CFX_GlyphBitmap* CFX_FaceCache::RenderGlyph_Nativetext( - const CFX_Font* pFont, + CFX_Font* pFont, uint32_t glyph_index, const CFX_Matrix* pMatrix, int dest_width, |