summaryrefslogtreecommitdiff
path: root/core/include/fxge
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2015-04-27 13:22:54 -0700
committerTom Sepez <tsepez@chromium.org>2015-04-27 13:22:54 -0700
commit6714cd8dd3327c0352f3d1fd03433692ff83b07f (patch)
tree0f05b09c56f7017ef2bba93ff94b768272285a63 /core/include/fxge
parent4f7bc04ed64edbf72f49b2189f85bb88f0b547c7 (diff)
downloadpdfium-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 'core/include/fxge')
-rw-r--r--core/include/fxge/fx_ge_win32.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/include/fxge/fx_ge_win32.h b/core/include/fxge/fx_ge_win32.h
index 311d355ef7..d39a8071e3 100644
--- a/core/include/fxge/fx_ge_win32.h
+++ b/core/include/fxge/fx_ge_win32.h
@@ -38,7 +38,7 @@ public:
static CFX_DIBitmap* LoadFromFile(FX_LPCSTR filename)
{
- return LoadFromFile(CFX_WideString::FromLocal(filename));
+ return LoadFromFile(CFX_WideString::FromLocal(filename).c_str());
}
static CFX_DIBitmap* LoadDIBitmap(WINDIB_Open_Args_ args);