fpdfsdk/src/fsdk_baseform.cpp - Issue 1105253002: Merge to XFA: Fix windows-specific usage of CFX_WideStr::operator LPCWSTR().

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: fpdfsdk/src/fsdk_baseform.cpp

Issue 1105253002: Merge to XFA: Fix windows-specific usage of CFX_WideStr::operator LPCWSTR(). (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@xfa

Patch Set: Created 5 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: fpdfsdk/src/fsdk_baseform.cpp

diff --git a/fpdfsdk/src/fsdk_baseform.cpp b/fpdfsdk/src/fsdk_baseform.cpp

index f98939441d2a47484b0f3a303cbe344f9bcb4850..976d276e8d305b00b7ced4516648a65c0963aa3f 100644

--- a/fpdfsdk/src/fsdk_baseform.cpp

+++ b/fpdfsdk/src/fsdk_baseform.cpp

@@ -2630,7 +2630,7 @@ CPDF_Stream* CPDFSDK_InterForm::LoadImageFromFile(const CFX_WideString& sFile)

CPDF_Stream* pRetStream = NULL;

- if (CFX_DIBitmap* pBmp = CFX_WindowsDIB::LoadFromFile(sFile))

+ if (CFX_DIBitmap* pBmp = CFX_WindowsDIB::LoadFromFile(sFile.c_str()))

{

int nWidth = pBmp->GetWidth();

int nHeight = pBmp->GetHeight();

« no previous file with comments | « core/src/fxcrt/fx_basic_util.cpp ('k') | no next file » | no next file with comments »