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

Side by Side Diff: fpdfsdk/fpdf_sysfontinfo.cpp

Issue 1885973002: Remove implicit cast from CFX_ByteString to (const char*). (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Typo 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 | « core/fxge/win32/fx_win32_gdipext.cpp ('k') | fpdfsdk/fpdfformfill.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 "public/fpdf_sysfontinfo.h" 7 #include "public/fpdf_sysfontinfo.h"
8 8
9 #include "fpdfsdk/include/fsdk_define.h" 9 #include "fpdfsdk/include/fsdk_define.h"
10 #include "fpdfsdk/pdfwindow/PWL_FontMap.h" 10 #include "fpdfsdk/pdfwindow/PWL_FontMap.h"
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 static unsigned long DefaultGetFaceName(struct _FPDF_SYSFONTINFO* pThis, 145 static unsigned long DefaultGetFaceName(struct _FPDF_SYSFONTINFO* pThis,
146 void* hFont, 146 void* hFont,
147 char* buffer, 147 char* buffer,
148 unsigned long buf_size) { 148 unsigned long buf_size) {
149 CFX_ByteString name; 149 CFX_ByteString name;
150 if (!((FPDF_SYSFONTINFO_DEFAULT*)pThis) 150 if (!((FPDF_SYSFONTINFO_DEFAULT*)pThis)
151 ->m_pFontInfo->GetFaceName(hFont, name)) 151 ->m_pFontInfo->GetFaceName(hFont, name))
152 return 0; 152 return 0;
153 if (name.GetLength() >= (long)buf_size) 153 if (name.GetLength() >= (long)buf_size)
154 return name.GetLength() + 1; 154 return name.GetLength() + 1;
155 FXSYS_strcpy(buffer, name); 155 FXSYS_strcpy(buffer, name.c_str());
156 return name.GetLength() + 1; 156 return name.GetLength() + 1;
157 } 157 }
158 158
159 static int DefaultGetFontCharset(struct _FPDF_SYSFONTINFO* pThis, void* hFont) { 159 static int DefaultGetFontCharset(struct _FPDF_SYSFONTINFO* pThis, void* hFont) {
160 int charset; 160 int charset;
161 if (!((FPDF_SYSFONTINFO_DEFAULT*)pThis) 161 if (!((FPDF_SYSFONTINFO_DEFAULT*)pThis)
162 ->m_pFontInfo->GetFontCharset(hFont, charset)) 162 ->m_pFontInfo->GetFontCharset(hFont, charset))
163 return 0; 163 return 0;
164 return charset; 164 return charset;
165 } 165 }
(...skipping 14 matching lines...) Expand all
180 pFontInfoExt->GetFaceName = DefaultGetFaceName; 180 pFontInfoExt->GetFaceName = DefaultGetFaceName;
181 pFontInfoExt->GetFont = DefaultGetFont; 181 pFontInfoExt->GetFont = DefaultGetFont;
182 pFontInfoExt->GetFontCharset = DefaultGetFontCharset; 182 pFontInfoExt->GetFontCharset = DefaultGetFontCharset;
183 pFontInfoExt->GetFontData = DefaultGetFontData; 183 pFontInfoExt->GetFontData = DefaultGetFontData;
184 pFontInfoExt->MapFont = DefaultMapFont; 184 pFontInfoExt->MapFont = DefaultMapFont;
185 pFontInfoExt->Release = DefaultRelease; 185 pFontInfoExt->Release = DefaultRelease;
186 pFontInfoExt->version = 1; 186 pFontInfoExt->version = 1;
187 pFontInfoExt->m_pFontInfo = pFontInfo; 187 pFontInfoExt->m_pFontInfo = pFontInfo;
188 return pFontInfoExt; 188 return pFontInfoExt;
189 } 189 }
OLDNEW
« no previous file with comments | « core/fxge/win32/fx_win32_gdipext.cpp ('k') | fpdfsdk/fpdfformfill.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698