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/datamatrix/BC_DataMatrixWriter.cpp | 2 +- xfa/src/fxbarcode/datamatrix/BC_ErrorCorrection.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'xfa/src/fxbarcode/datamatrix') diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixWriter.cpp b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixWriter.cpp index 4bccdd0bf8..7b1339ea19 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixWriter.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixWriter.cpp @@ -78,7 +78,7 @@ uint8_t* CBC_DataMatrixWriter::Encode(const CFX_WideString &contents, int32_t &o outWidth = bytematrix->GetWidth(); outHeight = bytematrix->GetHeight(); uint8_t* result = FX_Alloc(uint8_t, outWidth * outHeight); - FXSYS_memcpy32(result, bytematrix->GetArray(), outWidth * outHeight); + FXSYS_memcpy(result, bytematrix->GetArray(), outWidth * outHeight); delete bytematrix; delete placement; return result; diff --git a/xfa/src/fxbarcode/datamatrix/BC_ErrorCorrection.cpp b/xfa/src/fxbarcode/datamatrix/BC_ErrorCorrection.cpp index 89b920825f..9833f2871e 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_ErrorCorrection.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_ErrorCorrection.cpp @@ -163,7 +163,7 @@ CFX_WideString CBC_ErrorCorrection::createECCBlock(CFX_WideString codewords, int return (FX_WCHAR*)""; } FX_WORD* ecc = FX_Alloc(FX_WORD, numECWords); - FXSYS_memset32(ecc, 0, numECWords * sizeof(FX_WORD)); + FXSYS_memset(ecc, 0, numECWords * sizeof(FX_WORD)); for (int32_t l = start; l < start + len; l++) { uint8_t A = (uint8_t)codewords.GetAt(l); FX_WORD B = ecc[numECWords - 1]; -- cgit v1.2.3