From 6581175666ba4e1eb2826142376cbfe4495c6e76 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Thu, 11 Jun 2015 12:17:45 -0700 Subject: Merge to XFA: Kill FXSYS_mem{cpy,cmp,set.move}{32,8}. Only manual merge was core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp follwed by scripts. Original Review URL: https://codereview.chromium.org/1179693003. TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/1179953002. --- xfa/src/fxbarcode/pdf417/BC_PDF417ErrorCorrection.cpp | 2 +- xfa/src/fxbarcode/pdf417/BC_PDF417Writer.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'xfa/src/fxbarcode/pdf417') diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417ErrorCorrection.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417ErrorCorrection.cpp index 9dd6f67575..e940a4bc25 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417ErrorCorrection.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417ErrorCorrection.cpp @@ -166,7 +166,7 @@ CFX_WideString CBC_PDF417ErrorCorrection::generateErrorCorrection(CFX_WideString int32_t k = getErrorCorrectionCodewordCount(errorCorrectionLevel, e); BC_EXCEPTION_CHECK_ReturnValue(e, (FX_WCHAR)' '); FX_WCHAR* ech = FX_Alloc(FX_WCHAR, k * sizeof(FX_WCHAR)); - FXSYS_memset32(ech, 0, k * sizeof(FX_WCHAR)); + FXSYS_memset(ech, 0, k * sizeof(FX_WCHAR)); int32_t sld = dataCodewords.GetLength(); for (int32_t i = 0; i < sld; i++) { int32_t t1 = (dataCodewords.GetAt(i) + ech[k - 1]) % 929; diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417Writer.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417Writer.cpp index 5154b2e231..6dd4a8264f 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417Writer.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417Writer.cpp @@ -110,7 +110,7 @@ uint8_t* CBC_PDF417Writer::Encode(const CFX_WideString &contents, int32_t &outWi } } uint8_t* result = (uint8_t*)FX_Alloc(uint8_t, outHeight * outWidth); - FXSYS_memcpy32(result, originalScale.GetData(), outHeight * outWidth); + FXSYS_memcpy(result, originalScale.GetData(), outHeight * outWidth); return result; } void CBC_PDF417Writer::rotateArray(CFX_ByteArray& bitarray, int32_t height, int32_t width) -- cgit v1.2.3