From 6714cd8dd3327c0352f3d1fd03433692ff83b07f Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Mon, 27 Apr 2015 13:22:54 -0700 Subject: Merge to XFA: Fix windows-specific usage of CFX_WideStr::operator LPCWSTR(). Original Review URL: https://codereview.chromium.org/1103343002 R=brucedawson@chromium.org TBR=brucedawson@chromium.org Review URL: https://codereview.chromium.org/1105253002 --- fpdfsdk/src/fsdk_baseform.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'fpdfsdk/src/fsdk_baseform.cpp') diff --git a/fpdfsdk/src/fsdk_baseform.cpp b/fpdfsdk/src/fsdk_baseform.cpp index f98939441d..976d276e8d 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(); -- cgit v1.2.3