diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-04-27 13:22:54 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-04-27 13:22:54 -0700 |
| commit | 6714cd8dd3327c0352f3d1fd03433692ff83b07f (patch) | |
| tree | 0f05b09c56f7017ef2bba93ff94b768272285a63 /fpdfsdk/src | |
| parent | 4f7bc04ed64edbf72f49b2189f85bb88f0b547c7 (diff) | |
| download | pdfium-6714cd8dd3327c0352f3d1fd03433692ff83b07f.tar.xz | |
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
Diffstat (limited to 'fpdfsdk/src')
| -rw-r--r-- | fpdfsdk/src/fsdk_baseform.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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(); |