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

Side by Side Diff: core/fxge/include/fx_font.h

Issue 2032613003: Get rid of NULLs in core/ (Closed) Base URL: https://pdfium.googlesource.com/pdfium@master
Patch Set: Fix a bad merge Created 4 years, 6 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/fxge/include/fx_dib.h ('k') | core/fxge/include/fx_ge.h » ('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 #ifndef CORE_FXGE_INCLUDE_FX_FONT_H_ 7 #ifndef CORE_FXGE_INCLUDE_FX_FONT_H_
8 #define CORE_FXGE_INCLUDE_FX_FONT_H_ 8 #define CORE_FXGE_INCLUDE_FX_FONT_H_
9 9
10 #include <map> 10 #include <map>
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 int weight, 76 int weight,
77 int italic_angle, 77 int italic_angle,
78 int CharsetCP, 78 int CharsetCP,
79 FX_BOOL bVertical = FALSE); 79 FX_BOOL bVertical = FALSE);
80 FX_BOOL LoadEmbedded(const uint8_t* data, uint32_t size); 80 FX_BOOL LoadEmbedded(const uint8_t* data, uint32_t size);
81 FXFT_Face GetFace() const { return m_Face; } 81 FXFT_Face GetFace() const { return m_Face; }
82 82
83 #ifdef PDF_ENABLE_XFA 83 #ifdef PDF_ENABLE_XFA
84 FX_BOOL LoadFile(IFX_FileRead* pFile, 84 FX_BOOL LoadFile(IFX_FileRead* pFile,
85 int nFaceIndex = 0, 85 int nFaceIndex = 0,
86 int* pFaceCount = NULL); 86 int* pFaceCount = nullptr);
87 87
88 FX_BOOL LoadClone(const CFX_Font* pFont); 88 FX_BOOL LoadClone(const CFX_Font* pFont);
89 CFX_SubstFont* GetSubstFont() const { return m_pSubstFont; } 89 CFX_SubstFont* GetSubstFont() const { return m_pSubstFont; }
90 void SetFace(FXFT_Face face) { m_Face = face; } 90 void SetFace(FXFT_Face face) { m_Face = face; }
91 void SetSubstFont(CFX_SubstFont* subst) { m_pSubstFont = subst; } 91 void SetSubstFont(CFX_SubstFont* subst) { m_pSubstFont = subst; }
92 #else // PDF_ENABLE_XFA 92 #else // PDF_ENABLE_XFA
93 const CFX_SubstFont* GetSubstFont() const { return m_pSubstFont; } 93 const CFX_SubstFont* GetSubstFont() const { return m_pSubstFont; }
94 #endif // PDF_ENABLE_XFA 94 #endif // PDF_ENABLE_XFA
95 95
96 CFX_PathData* LoadGlyphPath(uint32_t glyph_index, int dest_width = 0); 96 CFX_PathData* LoadGlyphPath(uint32_t glyph_index, int dest_width = 0);
(...skipping 440 matching lines...) Expand 10 before | Expand all | Expand 10 after
537 FX_FLOAT retinaScaleX = 1.0f, 537 FX_FLOAT retinaScaleX = 1.0f,
538 FX_FLOAT retinaScaleY = 1.0f); 538 FX_FLOAT retinaScaleY = 1.0f);
539 539
540 CFX_ByteString GetNameFromTT(const uint8_t* name_table, 540 CFX_ByteString GetNameFromTT(const uint8_t* name_table,
541 uint32_t name_table_size, 541 uint32_t name_table_size,
542 uint32_t name); 542 uint32_t name);
543 543
544 int PDF_GetStandardFontName(CFX_ByteString* name); 544 int PDF_GetStandardFontName(CFX_ByteString* name);
545 545
546 #endif // CORE_FXGE_INCLUDE_FX_FONT_H_ 546 #endif // CORE_FXGE_INCLUDE_FX_FONT_H_
OLDNEW
« no previous file with comments | « core/fxge/include/fx_dib.h ('k') | core/fxge/include/fx_ge.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698