Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1511)

Side by Side Diff: core/src/fpdfapi/fpdf_render/fpdf_render_text.cpp

Issue 1869233002: Merge to M50: Fix a regression caused by 7cf13c9 (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@2661
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 PDFium Authors. All rights reserved. 1 // Copyright 2014 PDFium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com 5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
6 6
7 #include "core/src/fpdfapi/fpdf_render/render_int.h" 7 #include "core/src/fpdfapi/fpdf_render/render_int.h"
8 8
9 #include "core/include/fpdfapi/fpdf_pageobj.h" 9 #include "core/include/fpdfapi/fpdf_pageobj.h"
10 #include "core/include/fpdfapi/fpdf_render.h" 10 #include "core/include/fpdfapi/fpdf_render.h"
(...skipping 301 matching lines...) Expand 10 before | Expand all | Expand 10 after
312 pFont->m_pDocument->GetRenderData()->ReleaseCachedType3(pFont); 312 pFont->m_pDocument->GetRenderData()->ReleaseCachedType3(pFont);
313 pFont->m_pDocument->GetPageData()->ReleaseFont(pFont->GetFontDict()); 313 pFont->m_pDocument->GetPageData()->ReleaseFont(pFont->GetFontDict());
314 } 314 }
315 FX_BOOL CPDF_Type3Char::LoadBitmap(CPDF_RenderContext* pContext) { 315 FX_BOOL CPDF_Type3Char::LoadBitmap(CPDF_RenderContext* pContext) {
316 if (m_pBitmap || !m_pForm) { 316 if (m_pBitmap || !m_pForm) {
317 return TRUE; 317 return TRUE;
318 } 318 }
319 if (m_pForm->GetPageObjectList()->size() == 1 && !m_bColored) { 319 if (m_pForm->GetPageObjectList()->size() == 1 && !m_bColored) {
320 auto& pPageObj = m_pForm->GetPageObjectList()->front(); 320 auto& pPageObj = m_pForm->GetPageObjectList()->front();
321 if (pPageObj->IsImage()) { 321 if (pPageObj->IsImage()) {
322 m_ImageMatrix = pPageObj->AsImage()->m_Matrix;
322 const CFX_DIBSource* pSource = 323 const CFX_DIBSource* pSource =
323 pPageObj->AsImage()->m_pImage->LoadDIBSource(); 324 pPageObj->AsImage()->m_pImage->LoadDIBSource();
324 if (pSource) { 325 if (pSource) {
325 m_pBitmap = pSource->Clone(); 326 m_pBitmap = pSource->Clone();
326 delete pSource; 327 delete pSource;
327 } 328 }
328 delete m_pForm; 329 delete m_pForm;
329 m_pForm = NULL; 330 m_pForm = NULL;
330 return TRUE; 331 return TRUE;
331 } 332 }
(...skipping 445 matching lines...) Expand 10 before | Expand all | Expand 10 after
777 charpos.m_OriginY); 778 charpos.m_OriginY);
778 path.m_Path.New()->Append(pPath, &matrix); 779 path.m_Path.New()->Append(pPath, &matrix);
779 path.m_Matrix = *pTextMatrix; 780 path.m_Matrix = *pTextMatrix;
780 path.m_bStroke = bStroke; 781 path.m_bStroke = bStroke;
781 path.m_FillType = bFill ? FXFILL_WINDING : 0; 782 path.m_FillType = bFill ? FXFILL_WINDING : 0;
782 path.CalcBoundingBox(); 783 path.CalcBoundingBox();
783 ProcessPath(&path, pObj2Device); 784 ProcessPath(&path, pObj2Device);
784 } 785 }
785 } 786 }
786 787
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698