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

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

Issue 1293973002: Cleanup CFX_Font a bit. (Closed) Base URL: https://pdfium.googlesource.com/pdfium@master
Patch Set: rebase Created 5 years, 4 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 | « core/src/fpdfapi/fpdf_font/ttgsubtable.cpp ('k') | core/src/fxge/ge/fx_ge_font.cpp » ('j') | 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 "../../../include/fxge/fx_ge.h" 7 #include "../../../include/fxge/fx_ge.h"
8 #include "../../../include/fpdfapi/fpdf_render.h" 8 #include "../../../include/fpdfapi/fpdf_render.h"
9 #include "../../../include/fpdfapi/fpdf_pageobj.h" 9 #include "../../../include/fpdfapi/fpdf_pageobj.h"
10 #include "../fpdf_page/pageint.h" 10 #include "../fpdf_page/pageint.h"
(...skipping 770 matching lines...) Expand 10 before | Expand all | Expand 10 after
781 matrix.Concat(font_size, 0, 0, font_size, charpos.m_OriginX, 781 matrix.Concat(font_size, 0, 0, font_size, charpos.m_OriginX,
782 charpos.m_OriginY); 782 charpos.m_OriginY);
783 path.m_Path.New()->Append(pPath, &matrix); 783 path.m_Path.New()->Append(pPath, &matrix);
784 path.m_Matrix = *pTextMatrix; 784 path.m_Matrix = *pTextMatrix;
785 path.m_bStroke = bStroke; 785 path.m_bStroke = bStroke;
786 path.m_FillType = bFill ? FXFILL_WINDING : 0; 786 path.m_FillType = bFill ? FXFILL_WINDING : 0;
787 path.CalcBoundingBox(); 787 path.CalcBoundingBox();
788 ProcessPath(&path, pObj2Device); 788 ProcessPath(&path, pObj2Device);
789 } 789 }
790 } 790 }
791
791 CFX_PathData* CPDF_Font::LoadGlyphPath(FX_DWORD charcode, int dest_width) { 792 CFX_PathData* CPDF_Font::LoadGlyphPath(FX_DWORD charcode, int dest_width) {
792 int glyph_index = GlyphFromCharCode(charcode); 793 int glyph_index = GlyphFromCharCode(charcode);
793 if (m_Font.m_Face == NULL) { 794 if (!m_Font.GetFace())
794 return NULL; 795 return nullptr;
795 }
796 return m_Font.LoadGlyphPath(glyph_index, dest_width); 796 return m_Font.LoadGlyphPath(glyph_index, dest_width);
797 } 797 }
OLDNEW
« no previous file with comments | « core/src/fpdfapi/fpdf_font/ttgsubtable.cpp ('k') | core/src/fxge/ge/fx_ge_font.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698