xfa/fxfa/app/xfa_ffwidget.cpp - Issue 1857073002: Make down-conversion explicit from CFX_Widetring to CFX_WideStringC.

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: xfa/fxfa/app/xfa_ffwidget.cpp

Issue 1857073002: Make down-conversion explicit from CFX_Widetring to CFX_WideStringC. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master

Patch Set: Comment. 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: xfa/fxfa/app/xfa_ffwidget.cpp

diff --git a/xfa/fxfa/app/xfa_ffwidget.cpp b/xfa/fxfa/app/xfa_ffwidget.cpp

index 241bae0fdf10f1d1b967688626aa6196b1b37990..030d9da5f2ed85a1275974fbdd5ff62477300ce0 100644

--- a/xfa/fxfa/app/xfa_ffwidget.cpp

+++ b/xfa/fxfa/app/xfa_ffwidget.cpp

@@ -978,7 +978,7 @@ CFX_DIBitmap* XFA_LoadImageData(CXFA_FFDoc* pDoc,

}

CFX_WideString wsContentType;

pImage->GetContentType(wsContentType);

- FXCODEC_IMAGE_TYPE type = XFA_GetImageType(wsContentType);

+ FXCODEC_IMAGE_TYPE type = XFA_GetImageType(wsContentType.AsWideStringC());

CFX_ByteString bsContent;

uint8_t* pImageBuffer = NULL;

IFX_FileRead* pImageFileRead = NULL;

@@ -1003,7 +1003,7 @@ CFX_DIBitmap* XFA_LoadImageData(CXFA_FFDoc* pDoc,

if (wsURL.Left(7) != FX_WSTRC(L"http://") &&

wsURL.Left(6) != FX_WSTRC(L"ftp://")) {

CFX_DIBitmap* pBitmap =

- pDoc->GetPDFNamedImage(wsURL, iImageXDpi, iImageYDpi);

+ pDoc->GetPDFNamedImage(wsURL.AsWideStringC(), iImageXDpi, iImageYDpi);

if (pBitmap) {

bNameImage = TRUE;

return pBitmap;

« xfa/fxfa/app/xfa_ffimageedit.cpp ('K') | « xfa/fxfa/app/xfa_fftextedit.cpp ('k') | xfa/fxfa/app/xfa_ffwidgetacc.cpp » ('j') | no next file with comments »