From 50cce609050e1a40e1d6936e0a3f0614b4483eee Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Wed, 24 Feb 2016 09:51:16 -0500 Subject: Fixing whitespace lint errors. This CL enables several of the diabled whitelist/* lint checks. R=thestig@chromium.org, tsepez@chromium.org Review URL: https://codereview.chromium.org/1730553002 . --- core/src/fpdfapi/fpdf_render/fpdf_render_text.cpp | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) (limited to 'core/src/fpdfapi') diff --git a/core/src/fpdfapi/fpdf_render/fpdf_render_text.cpp b/core/src/fpdfapi/fpdf_render/fpdf_render_text.cpp index 136c318339..3f797c3c5b 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); -- cgit v1.2.3