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/common/BC_CommonBitMatrix.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'xfa/src/fxbarcode/common/BC_CommonBitMatrix.cpp') diff --git a/xfa/src/fxbarcode/common/BC_CommonBitMatrix.cpp b/xfa/src/fxbarcode/common/BC_CommonBitMatrix.cpp index 135dd2ff28..96dbed8d66 100644 --- a/xfa/src/fxbarcode/common/BC_CommonBitMatrix.cpp +++ b/xfa/src/fxbarcode/common/BC_CommonBitMatrix.cpp @@ -37,7 +37,7 @@ void CBC_CommonBitMatrix::Init(int32_t dimension) int32_t rowSize = (m_height + 31) >> 5; m_rowSize = rowSize; m_bits = FX_Alloc(int32_t, m_rowSize * m_height); - FXSYS_memset32(m_bits, 0, m_rowSize * m_height * sizeof(int32_t)); + FXSYS_memset(m_bits, 0, m_rowSize * m_height * sizeof(int32_t)); } void CBC_CommonBitMatrix::Init(int32_t width, int32_t height) { @@ -46,7 +46,7 @@ void CBC_CommonBitMatrix::Init(int32_t width, int32_t height) int32_t rowSize = (width + 31) >> 5; m_rowSize = rowSize; m_bits = FX_Alloc(int32_t, m_rowSize * m_height); - FXSYS_memset32(m_bits, 0, m_rowSize * m_height * sizeof(int32_t)); + FXSYS_memset(m_bits, 0, m_rowSize * m_height * sizeof(int32_t)); } CBC_CommonBitMatrix::~CBC_CommonBitMatrix() { @@ -83,7 +83,7 @@ void CBC_CommonBitMatrix::Flip(int32_t x, int32_t y) } void CBC_CommonBitMatrix::Clear() { - FXSYS_memset32(m_bits, 0, m_rowSize * m_height * sizeof(int32_t)); + FXSYS_memset(m_bits, 0, m_rowSize * m_height * sizeof(int32_t)); } void CBC_CommonBitMatrix::SetRegion(int32_t left, int32_t top, int32_t width, int32_t height, int32_t &e) { -- cgit v1.2.3