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

Side by Side Diff: fpdfsdk/fpdf_sysfontinfo.cpp

Issue 2459073002: Continue fixing FX_BOOL / int noise (Closed)
Patch Set: Created 4 years, 1 month 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
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 "public/fpdf_sysfontinfo.h" 7 #include "public/fpdf_sysfontinfo.h"
8 8
9 #include "core/fxge/cfx_fontmapper.h" 9 #include "core/fxge/cfx_fontmapper.h"
10 #include "core/fxge/cfx_gemodule.h" 10 #include "core/fxge/cfx_gemodule.h"
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 } 122 }
123 123
124 static void* DefaultMapFont(struct _FPDF_SYSFONTINFO* pThis, 124 static void* DefaultMapFont(struct _FPDF_SYSFONTINFO* pThis,
125 int weight, 125 int weight,
126 int bItalic, 126 int bItalic,
127 int charset, 127 int charset,
128 int pitch_family, 128 int pitch_family,
129 const char* family, 129 const char* family,
130 int* bExact) { 130 int* bExact) {
131 auto* pDefault = static_cast<FPDF_SYSFONTINFO_DEFAULT*>(pThis); 131 auto* pDefault = static_cast<FPDF_SYSFONTINFO_DEFAULT*>(pThis);
132 return pDefault->m_pFontInfo->MapFont(weight, bItalic, charset, pitch_family, 132 return pDefault->m_pFontInfo->MapFont(weight, !!bItalic, charset,
133 family, *bExact); 133 pitch_family, family, *bExact);
134 } 134 }
135 135
136 void* DefaultGetFont(struct _FPDF_SYSFONTINFO* pThis, const char* family) { 136 void* DefaultGetFont(struct _FPDF_SYSFONTINFO* pThis, const char* family) {
137 auto* pDefault = static_cast<FPDF_SYSFONTINFO_DEFAULT*>(pThis); 137 auto* pDefault = static_cast<FPDF_SYSFONTINFO_DEFAULT*>(pThis);
138 return pDefault->m_pFontInfo->GetFont(family); 138 return pDefault->m_pFontInfo->GetFont(family);
139 } 139 }
140 140
141 static unsigned long DefaultGetFontData(struct _FPDF_SYSFONTINFO* pThis, 141 static unsigned long DefaultGetFontData(struct _FPDF_SYSFONTINFO* pThis,
142 void* hFont, 142 void* hFont,
143 unsigned int table, 143 unsigned int table,
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
187 pFontInfoExt->GetFaceName = DefaultGetFaceName; 187 pFontInfoExt->GetFaceName = DefaultGetFaceName;
188 pFontInfoExt->GetFont = DefaultGetFont; 188 pFontInfoExt->GetFont = DefaultGetFont;
189 pFontInfoExt->GetFontCharset = DefaultGetFontCharset; 189 pFontInfoExt->GetFontCharset = DefaultGetFontCharset;
190 pFontInfoExt->GetFontData = DefaultGetFontData; 190 pFontInfoExt->GetFontData = DefaultGetFontData;
191 pFontInfoExt->MapFont = DefaultMapFont; 191 pFontInfoExt->MapFont = DefaultMapFont;
192 pFontInfoExt->Release = DefaultRelease; 192 pFontInfoExt->Release = DefaultRelease;
193 pFontInfoExt->version = 1; 193 pFontInfoExt->version = 1;
194 pFontInfoExt->m_pFontInfo = pFontInfo.release(); 194 pFontInfoExt->m_pFontInfo = pFontInfo.release();
195 return pFontInfoExt; 195 return pFontInfoExt;
196 } 196 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698