core/fxcrt/fx_arabic.cpp - Issue 1882043004: Remove implicit cast from CFX_WideString to (const wchar_t*)

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: core/fxcrt/fx_arabic.cpp

Issue 1882043004: Remove implicit cast from CFX_WideString to (const wchar_t*) (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master

Patch Set: win error #2 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 side-by-side diff with in-line comments

Download patch

Index: core/fxcrt/fx_arabic.cpp

diff --git a/core/fxcrt/fx_arabic.cpp b/core/fxcrt/fx_arabic.cpp

index 803683782d30b609ec44bf8698e4bdb23a200fa8..8c5230731fd57c817315b8b1620607042bd2bc7d 100644

--- a/core/fxcrt/fx_arabic.cpp

+++ b/core/fxcrt/fx_arabic.cpp

@@ -221,7 +221,7 @@ void FX_BidiReverseString(CFX_WideString& wsText,

FXSYS_assert(iStart > -1 && iStart < wsText.GetLength());

FXSYS_assert(iCount >= 0 && iStart + iCount <= wsText.GetLength());

FX_WCHAR wch;

- FX_WCHAR* pStart = (FX_WCHAR*)(const FX_WCHAR*)wsText;

+ FX_WCHAR* pStart = const_cast<FX_WCHAR*>(wsText.c_str());

pStart += iStart;

FX_WCHAR* pEnd = pStart + iCount - 1;

while (pStart < pEnd) {

@@ -252,7 +252,7 @@ void FX_BidiClassify(const CFX_WideString& wsText,

FX_BOOL bWS) {

FXSYS_assert(wsText.GetLength() == classes.GetSize());

int32_t iCount = wsText.GetLength();

- const FX_WCHAR* pwsStart = (const FX_WCHAR*)wsText;

+ const FX_WCHAR* pwsStart = wsText.c_str();

FX_WCHAR wch;

int32_t iCls;

if (bWS) {

« no previous file with comments | « core/fxcrt/extension.h ('k') | core/fxcrt/include/fx_string.h » ('j') | no next file with comments »