| Index: core/src/fpdfapi/fpdf_render/fpdf_render_text.cpp
|
| diff --git a/core/src/fpdfapi/fpdf_render/fpdf_render_text.cpp b/core/src/fpdfapi/fpdf_render/fpdf_render_text.cpp
|
| index 136c3183391a74915b4e85a2a4b0bf3685bb8e5c..3f797c3c5b87ed03c0e824f606f44f25701738ea 100644
|
| --- a/core/src/fpdfapi/fpdf_render/fpdf_render_text.cpp
|
| +++ b/core/src/fpdfapi/fpdf_render/fpdf_render_text.cpp
|
| @@ -659,19 +659,22 @@ void CPDF_TextRenderer::DrawTextString(CFX_RenderDevice* pDevice,
|
| }
|
| }
|
| CFX_Matrix matrix;
|
| - if (pMatrix) {
|
| + if (pMatrix)
|
| matrix = *pMatrix;
|
| - }
|
| +
|
| matrix.e = origin_x;
|
| matrix.f = origin_y;
|
| - if (pFont->GetFontType() == PDFFONT_TYPE3)
|
| - ;
|
| - else if (stroke_argb == 0) {
|
| - DrawNormalText(pDevice, nChars, pCharCodes, pCharPos, pFont, font_size,
|
| - &matrix, fill_argb, pOptions);
|
| - } else
|
| - DrawTextPath(pDevice, nChars, pCharCodes, pCharPos, pFont, font_size,
|
| - &matrix, NULL, pGraphState, fill_argb, stroke_argb, NULL);
|
| +
|
| + if (pFont->GetFontType() != PDFFONT_TYPE3) {
|
| + if (stroke_argb == 0) {
|
| + DrawNormalText(pDevice, nChars, pCharCodes, pCharPos, pFont, font_size,
|
| + &matrix, fill_argb, pOptions);
|
| + } else {
|
| + DrawTextPath(pDevice, nChars, pCharCodes, pCharPos, pFont, font_size,
|
| + &matrix, NULL, pGraphState, fill_argb, stroke_argb, NULL);
|
| + }
|
| + }
|
| +
|
| if (nChars > 1) {
|
| FX_Free(pCharCodes);
|
| FX_Free(pCharPos);
|
|
|