Index: core/fxge/apple/fx_quartz_device.cpp |
diff --git a/core/fxge/apple/fx_quartz_device.cpp b/core/fxge/apple/fx_quartz_device.cpp |
index 6a0260b1d62731a7422bc3c2c499cfe8e1fd3cb6..400e29085cb27f6f09655def748dc9c2e73c542c 100644 |
--- a/core/fxge/apple/fx_quartz_device.cpp |
+++ b/core/fxge/apple/fx_quartz_device.cpp |
@@ -13,6 +13,7 @@ |
#include "core/fxcrt/include/fx_memory.h" |
#include "core/fxge/dib/dib_int.h" |
#include "core/fxge/ge/fx_text_int.h" |
+#include "core/fxge/include/cfx_fontcache.h" |
#include "core/fxge/include/cfx_gemodule.h" |
#include "core/fxge/include/cfx_graphstatedata.h" |
#include "core/fxge/include/cfx_pathdata.h" |
@@ -745,6 +746,7 @@ |
int nChars, |
const FXTEXT_CHARPOS* pCharPos, |
CFX_Font* pFont, |
+ CFX_FontCache* pCache, |
const CFX_Matrix* pGlyphMatrix, |
const CFX_Matrix* pObject2Device, |
FX_FLOAT font_size, |
@@ -810,6 +812,7 @@ |
FX_BOOL CFX_QuartzDeviceDriver::DrawDeviceText(int nChars, |
const FXTEXT_CHARPOS* pCharPos, |
CFX_Font* pFont, |
+ CFX_FontCache* pCache, |
const CFX_Matrix* pObject2Device, |
FX_FLOAT font_size, |
uint32_t color) { |
@@ -829,8 +832,8 @@ |
while (i < nChars) { |
if (pCharPos[i].m_bGlyphAdjust || font_size < 0) { |
if (i > 0) { |
- ret = CG_DrawGlyphRun(i, pCharPos, pFont, nullptr, pObject2Device, |
- font_size, color); |
+ ret = CG_DrawGlyphRun(i, pCharPos, pFont, pCache, nullptr, |
+ pObject2Device, font_size, color); |
if (!ret) { |
RestoreState(false); |
return ret; |
@@ -846,8 +849,8 @@ |
char_pos->m_AdjustMatrix[0], char_pos->m_AdjustMatrix[1], |
char_pos->m_AdjustMatrix[2], char_pos->m_AdjustMatrix[3], 0, 0); |
} |
- ret = CG_DrawGlyphRun(1, char_pos, pFont, &glphy_matrix, pObject2Device, |
- font_size, color); |
+ ret = CG_DrawGlyphRun(1, char_pos, pFont, pCache, &glphy_matrix, |
+ pObject2Device, font_size, color); |
if (!ret) { |
RestoreState(false); |
return ret; |
@@ -861,7 +864,7 @@ |
} |
} |
if (i > 0) { |
- ret = CG_DrawGlyphRun(i, pCharPos, pFont, nullptr, pObject2Device, |
+ ret = CG_DrawGlyphRun(i, pCharPos, pFont, pCache, nullptr, pObject2Device, |
font_size, color); |
} |
RestoreState(false); |