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.

1 files changed, 1 insertions, 1 deletions

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;