diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-06-11 12:17:45 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-06-11 12:17:45 -0700 |
| commit | 6581175666ba4e1eb2826142376cbfe4495c6e76 (patch) | |
| tree | 38770d7cf709979b0d493a6ca0367a0cbc080736 /xfa/src/fxbarcode/qrcode | |
| parent | 05f11bcf48a630b53cac603538bb75f21ad4231d (diff) | |
| download | pdfium-6581175666ba4e1eb2826142376cbfe4495c6e76.tar.xz | |
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.
Diffstat (limited to 'xfa/src/fxbarcode/qrcode')
| -rw-r--r-- | xfa/src/fxbarcode/qrcode/BC_QRCodeWriter.cpp | 2 | ||||
| -rw-r--r-- | xfa/src/fxbarcode/qrcode/BC_QRCoderBitVector.cpp | 2 | ||||
| -rw-r--r-- | xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCodeWriter.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCodeWriter.cpp index 37d0277bec..c52ec8e4bb 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRCodeWriter.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRCodeWriter.cpp @@ -90,7 +90,7 @@ uint8_t* CBC_QRCodeWriter::Encode(const CFX_WideString& contents, int32_t ecLeve outWidth = qr.GetMatrixWidth();
outHeight = qr.GetMatrixWidth();
uint8_t* result = FX_Alloc(uint8_t, outWidth * outWidth);
- FXSYS_memcpy32(result, qr.GetMatrix()->GetArray(), outWidth * outHeight);
+ FXSYS_memcpy(result, qr.GetMatrix()->GetArray(), outWidth * outHeight);
return result;
}
uint8_t *CBC_QRCodeWriter::Encode(const CFX_ByteString& contents, BCFORMAT format, int32_t &outWidth, int32_t &outHeight, int32_t hints, int32_t &e)
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderBitVector.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderBitVector.cpp index 53a5e487a4..8bf5ba3d22 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRCoderBitVector.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderBitVector.cpp @@ -129,7 +129,7 @@ void CBC_QRCoderBitVector::AppendByte(int32_t value) {
if((m_sizeInBits >> 3) == m_size) {
uint8_t* newArray = FX_Alloc(uint8_t, m_size << 1);
- FXSYS_memcpy32(newArray, m_array, m_size);
+ FXSYS_memcpy(newArray, m_array, m_size);
if(m_array != NULL) {
FX_Free(m_array);
}
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.cpp b/xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.cpp index ab2702e343..7c6ea67744 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.cpp @@ -159,7 +159,7 @@ void CBC_QRDecodedBitStreamParser::DecodeByteSegment(CBC_CommonBitSource* bits, BC_EXCEPTION_CHECK_ReturnVoid(e);
}
uint8_t *readBytes = FX_Alloc(uint8_t, count);
- FXSYS_memset32(readBytes, 0x00, count);
+ FXSYS_memset(readBytes, 0x00, count);
for(int32_t i = 0; i < count; i++) {
readBytes[i] = (uint8_t) bits->ReadBits(8, e);
BC_EXCEPTION_CHECK_ReturnVoid(e);
|