From c616483e834b791b92b0c0d4f99d0ea3b66f1a4f Mon Sep 17 00:00:00 2001 From: Bo Xu Date: Tue, 30 Dec 2014 16:56:12 -0800 Subject: XFA: merge patch from CL 733693003, get rid of FX_LPCSTR cast Get rid of FX_LPCSTR cast. Follow up on https://codereview.chromium.org/733693003 R=brucedawson@chromium.org, tsepez@chromium.org Review URL: https://codereview.chromium.org/809993004 --- fpdfsdk/src/fpdfdoc.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'fpdfsdk/src/fpdfdoc.cpp') diff --git a/fpdfsdk/src/fpdfdoc.cpp b/fpdfsdk/src/fpdfdoc.cpp index 643e398cfd..79d335da53 100644 --- a/fpdfsdk/src/fpdfdoc.cpp +++ b/fpdfsdk/src/fpdfdoc.cpp @@ -109,7 +109,7 @@ DLLEXPORT unsigned long STDCALL FPDFAction_GetURIPath(FPDF_DOCUMENT document, FP CFX_ByteString path = Action.GetURI(pDoc); unsigned long len = path.GetLength() + 1; if (buffer != NULL && buflen >= len) - FXSYS_memcpy(buffer, (FX_LPCSTR)path, len); + FXSYS_memcpy(buffer, path.c_str(), len); return len; } @@ -255,7 +255,7 @@ DLLEXPORT unsigned long STDCALL FPDF_GetMetaText(FPDF_DOCUMENT doc, FPDF_BYTESTR CFX_ByteString bstr = text.UTF16LE_Encode(); unsigned long len = bstr.GetLength(); if (buffer != NULL && buflen >= len+2) { - FXSYS_memcpy(buffer, (FX_LPCSTR)bstr, len); + FXSYS_memcpy(buffer, bstr.c_str(), len); // use double zero as trailer ((FX_BYTE*)buffer)[len] = ((FX_BYTE*)buffer)[len+1] = 0; } -- cgit v1.2.3