Index: xfa/fxbarcode/oned/BC_OnedUPCAWriter.cpp |
diff --git a/xfa/fxbarcode/oned/BC_OnedUPCAWriter.cpp b/xfa/fxbarcode/oned/BC_OnedUPCAWriter.cpp |
index 12acb5280b5c2e5d2e8bc934dfe2b564ae1f426b..01660b75c76315a7ad10585c79a7eed6f8a554ed 100644 |
--- a/xfa/fxbarcode/oned/BC_OnedUPCAWriter.cpp |
+++ b/xfa/fxbarcode/oned/BC_OnedUPCAWriter.cpp |
@@ -190,7 +190,8 @@ |
if (pOutBitmap) { |
ge.Create((int)strWidth, iTextHeight, FXDIB_Argb, nullptr); |
ge.GetBitmap()->Clear(m_backgroundColor); |
- ge.DrawNormalText(iLen, pCharPos + 1, m_pFont, (FX_FLOAT)iFontSize, |
+ ge.DrawNormalText(iLen, pCharPos + 1, m_pFont, |
+ CFX_GEModule::Get()->GetFontCache(), (FX_FLOAT)iFontSize, |
&affine_matrix, m_fontColor, FXTEXT_CLEARTYPE); |
geBitmap.SetDIBits(ge.GetBitmap(), leftPosition, m_Height - iTextHeight); |
} else { |
@@ -200,8 +201,9 @@ |
if (matrix) { |
affine_matrix1.Concat(*matrix); |
} |
- device->DrawNormalText(iLen, pCharPos + 1, m_pFont, (FX_FLOAT)iFontSize, |
- &affine_matrix1, m_fontColor, FXTEXT_CLEARTYPE); |
+ device->DrawNormalText( |
+ iLen, pCharPos + 1, m_pFont, CFX_GEModule::Get()->GetFontCache(), |
+ (FX_FLOAT)iFontSize, &affine_matrix1, m_fontColor, FXTEXT_CLEARTYPE); |
} |
tempStr = str.Mid(6, 5); |
iLen = tempStr.GetLength(); |
@@ -209,7 +211,8 @@ |
if (pOutBitmap) { |
FX_RECT rect2(0, 0, (int)strWidth, iTextHeight); |
ge.FillRect(&rect2, m_backgroundColor); |
- ge.DrawNormalText(iLen, pCharPos + 6, m_pFont, (FX_FLOAT)iFontSize, |
+ ge.DrawNormalText(iLen, pCharPos + 6, m_pFont, |
+ CFX_GEModule::Get()->GetFontCache(), (FX_FLOAT)iFontSize, |
&affine_matrix, m_fontColor, FXTEXT_CLEARTYPE); |
geBitmap.SetDIBits(ge.GetBitmap(), leftPosition + 40 * multiple, |
m_Height - iTextHeight); |
@@ -221,8 +224,9 @@ |
if (matrix) { |
affine_matrix1.Concat(*matrix); |
} |
- device->DrawNormalText(iLen, pCharPos + 6, m_pFont, (FX_FLOAT)iFontSize, |
- &affine_matrix1, m_fontColor, FXTEXT_CLEARTYPE); |
+ device->DrawNormalText( |
+ iLen, pCharPos + 6, m_pFont, CFX_GEModule::Get()->GetFontCache(), |
+ (FX_FLOAT)iFontSize, &affine_matrix1, m_fontColor, FXTEXT_CLEARTYPE); |
} |
tempStr = str.Mid(0, 1); |
iLen = tempStr.GetLength(); |
@@ -235,7 +239,8 @@ |
delete ge.GetBitmap(); |
ge.Create((int)strWidth, iTextHeight, FXDIB_Argb, nullptr); |
ge.GetBitmap()->Clear(m_backgroundColor); |
- ge.DrawNormalText(iLen, pCharPos, m_pFont, (FX_FLOAT)iFontSize, |
+ ge.DrawNormalText(iLen, pCharPos, m_pFont, |
+ CFX_GEModule::Get()->GetFontCache(), (FX_FLOAT)iFontSize, |
&affine_matrix, m_fontColor, FXTEXT_CLEARTYPE); |
geBitmap.SetDIBits(ge.GetBitmap(), 0, m_Height - iTextHeight); |
} else { |
@@ -244,8 +249,9 @@ |
if (matrix) { |
affine_matrix1.Concat(*matrix); |
} |
- device->DrawNormalText(iLen, pCharPos, m_pFont, (FX_FLOAT)iFontSize, |
- &affine_matrix1, m_fontColor, FXTEXT_CLEARTYPE); |
+ device->DrawNormalText( |
+ iLen, pCharPos, m_pFont, CFX_GEModule::Get()->GetFontCache(), |
+ (FX_FLOAT)iFontSize, &affine_matrix1, m_fontColor, FXTEXT_CLEARTYPE); |
} |
tempStr = str.Mid(11, 1); |
iLen = tempStr.GetLength(); |
@@ -254,7 +260,8 @@ |
delete ge.GetBitmap(); |
ge.Create((int)strWidth, iTextHeight, FXDIB_Argb, nullptr); |
ge.GetBitmap()->Clear(m_backgroundColor); |
- ge.DrawNormalText(iLen, pCharPos + 11, m_pFont, (FX_FLOAT)iFontSize, |
+ ge.DrawNormalText(iLen, pCharPos + 11, m_pFont, |
+ CFX_GEModule::Get()->GetFontCache(), (FX_FLOAT)iFontSize, |
&affine_matrix, m_fontColor, FXTEXT_CLEARTYPE); |
geBitmap.SetDIBits(ge.GetBitmap(), leftPosition + 85 * multiple, |
m_Height - iTextHeight); |
@@ -266,8 +273,9 @@ |
if (matrix) { |
affine_matrix1.Concat(*matrix); |
} |
- device->DrawNormalText(iLen, pCharPos + 11, m_pFont, (FX_FLOAT)iFontSize, |
- &affine_matrix1, m_fontColor, FXTEXT_CLEARTYPE); |
+ device->DrawNormalText( |
+ iLen, pCharPos + 11, m_pFont, CFX_GEModule::Get()->GetFontCache(), |
+ (FX_FLOAT)iFontSize, &affine_matrix1, m_fontColor, FXTEXT_CLEARTYPE); |
} |
FX_Free(pCharPos); |
} |