summaryrefslogtreecommitdiff
path: root/xfa
diff options
context:
space:
mode:
Diffstat (limited to 'xfa')
-rw-r--r--xfa/src/fxbarcode/common/BC_CommonBitArray.cpp6
-rw-r--r--xfa/src/fxbarcode/common/BC_CommonBitMatrix.cpp6
-rw-r--r--xfa/src/fxbarcode/common/BC_CommonByteArray.cpp10
-rw-r--r--xfa/src/fxbarcode/common/BC_CommonByteMatrix.cpp2
-rw-r--r--xfa/src/fxbarcode/datamatrix/BC_DataMatrixWriter.cpp2
-rw-r--r--xfa/src/fxbarcode/datamatrix/BC_ErrorCorrection.cpp2
-rw-r--r--xfa/src/fxbarcode/oned/BC_OneDimWriter.cpp2
-rw-r--r--xfa/src/fxbarcode/oned/BC_OnedEAN13Writer.cpp2
-rw-r--r--xfa/src/fxbarcode/oned/BC_OnedEAN8Writer.cpp2
-rw-r--r--xfa/src/fxbarcode/oned/BC_OnedUPCAWriter.cpp2
-rw-r--r--xfa/src/fxbarcode/pdf417/BC_PDF417ErrorCorrection.cpp2
-rw-r--r--xfa/src/fxbarcode/pdf417/BC_PDF417Writer.cpp2
-rw-r--r--xfa/src/fxbarcode/qrcode/BC_QRCodeWriter.cpp2
-rw-r--r--xfa/src/fxbarcode/qrcode/BC_QRCoderBitVector.cpp2
-rw-r--r--xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.cpp2
15 files changed, 23 insertions, 23 deletions
diff --git a/xfa/src/fxbarcode/common/BC_CommonBitArray.cpp b/xfa/src/fxbarcode/common/BC_CommonBitArray.cpp
index a73fd37148..71c5217cf9 100644
--- a/xfa/src/fxbarcode/common/BC_CommonBitArray.cpp
+++ b/xfa/src/fxbarcode/common/BC_CommonBitArray.cpp
@@ -71,7 +71,7 @@ void CBC_CommonBitArray::SetBulk(int32_t i, int32_t newBits)
}
void CBC_CommonBitArray::Clear()
{
- FXSYS_memset32(&m_bits[0], 0x00, m_bits.GetSize() * sizeof(int32_t));
+ FXSYS_memset(&m_bits[0], 0x00, m_bits.GetSize() * sizeof(int32_t));
}
FX_BOOL CBC_CommonBitArray::IsRange(int32_t start, int32_t end, FX_BOOL value, int32_t &e)
{
@@ -111,7 +111,7 @@ int32_t* CBC_CommonBitArray::GetBitArray()
void CBC_CommonBitArray::Reverse()
{
int32_t* newBits = FX_Alloc(int32_t, m_bits.GetSize());
- FXSYS_memset32(newBits, 0x00, m_bits.GetSize() * sizeof(int32_t));
+ FXSYS_memset(newBits, 0x00, m_bits.GetSize() * sizeof(int32_t));
int32_t size = m_size;
int32_t i;
for (i = 0; i < size; i++) {
@@ -119,6 +119,6 @@ void CBC_CommonBitArray::Reverse()
newBits[i >> 5] |= 1 << (i & 0x1F);
}
}
- FXSYS_memcpy32(&m_bits[0], newBits, m_bits.GetSize() * sizeof(int32_t));
+ FXSYS_memcpy(&m_bits[0], newBits, m_bits.GetSize() * sizeof(int32_t));
FX_Free(newBits);
}
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)
{
diff --git a/xfa/src/fxbarcode/common/BC_CommonByteArray.cpp b/xfa/src/fxbarcode/common/BC_CommonByteArray.cpp
index 4b9667e406..bec79d2ba0 100644
--- a/xfa/src/fxbarcode/common/BC_CommonByteArray.cpp
+++ b/xfa/src/fxbarcode/common/BC_CommonByteArray.cpp
@@ -32,14 +32,14 @@ CBC_CommonByteArray::CBC_CommonByteArray(int32_t size)
{
m_size = size;
m_bytes = FX_Alloc(uint8_t, size);
- FXSYS_memset32(m_bytes, 0, size);
+ FXSYS_memset(m_bytes, 0, size);
m_index = 0;
}
CBC_CommonByteArray::CBC_CommonByteArray(uint8_t* byteArray, int32_t size)
{
m_size = size;
m_bytes = FX_Alloc(uint8_t, size);
- FXSYS_memcpy32(m_bytes, byteArray, size);
+ FXSYS_memcpy(m_bytes, byteArray, size);
m_index = size;
}
CBC_CommonByteArray::~CBC_CommonByteArray()
@@ -80,9 +80,9 @@ void CBC_CommonByteArray::Reserve(int32_t capacity)
{
if (m_bytes == NULL || m_size < capacity) {
uint8_t *newArray = FX_Alloc(uint8_t, capacity);
- FXSYS_memset32(newArray, 0, capacity);
+ FXSYS_memset(newArray, 0, capacity);
if (m_bytes != NULL) {
- FXSYS_memcpy32(newArray, m_bytes, m_size);
+ FXSYS_memcpy(newArray, m_bytes, m_size);
FX_Free( m_bytes );
}
m_bytes = newArray;
@@ -96,7 +96,7 @@ void CBC_CommonByteArray::Set(uint8_t* source, int32_t offset, int32_t count)
}
m_bytes = FX_Alloc(uint8_t, count);
m_size = count;
- FXSYS_memcpy32(m_bytes, source + offset, count);
+ FXSYS_memcpy(m_bytes, source + offset, count);
m_index = count;
}
void CBC_CommonByteArray::Set(CFX_ByteArray* source, int32_t offset, int32_t count)
diff --git a/xfa/src/fxbarcode/common/BC_CommonByteMatrix.cpp b/xfa/src/fxbarcode/common/BC_CommonByteMatrix.cpp
index da4741d11a..d963eb9f5e 100644
--- a/xfa/src/fxbarcode/common/BC_CommonByteMatrix.cpp
+++ b/xfa/src/fxbarcode/common/BC_CommonByteMatrix.cpp
@@ -31,7 +31,7 @@ CBC_CommonByteMatrix::CBC_CommonByteMatrix(int32_t width, int32_t height)
void CBC_CommonByteMatrix::Init()
{
m_bytes = FX_Alloc(uint8_t, m_height * m_width);
- FXSYS_memset8(m_bytes, 0xff, m_height * m_width);
+ FXSYS_memset(m_bytes, 0xff, m_height * m_width);
}
CBC_CommonByteMatrix::~CBC_CommonByteMatrix()
{
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];
diff --git a/xfa/src/fxbarcode/oned/BC_OneDimWriter.cpp b/xfa/src/fxbarcode/oned/BC_OneDimWriter.cpp
index e2a0da6c95..382b82a12b 100644
--- a/xfa/src/fxbarcode/oned/BC_OneDimWriter.cpp
+++ b/xfa/src/fxbarcode/oned/BC_OneDimWriter.cpp
@@ -230,7 +230,7 @@ void CBC_OneDimWriter::ShowChars(const CFX_WideStringC& contents, CFX_DIBitmap *
if (!pCharPos) {
return;
}
- FXSYS_memset32(pCharPos, 0, sizeof(FXTEXT_CHARPOS) * iLen);
+ FXSYS_memset(pCharPos, 0, sizeof(FXTEXT_CHARPOS) * iLen);
FX_FLOAT charsLen = 0;
FX_FLOAT geWidth = 0;
if ( m_locTextLoc == BC_TEXT_LOC_ABOVEEMBED ||
diff --git a/xfa/src/fxbarcode/oned/BC_OnedEAN13Writer.cpp b/xfa/src/fxbarcode/oned/BC_OnedEAN13Writer.cpp
index 0ecb3d06a7..7753d1eabb 100644
--- a/xfa/src/fxbarcode/oned/BC_OnedEAN13Writer.cpp
+++ b/xfa/src/fxbarcode/oned/BC_OnedEAN13Writer.cpp
@@ -162,7 +162,7 @@ void CBC_OnedEAN13Writer::ShowChars(const CFX_WideStringC& contents, CFX_DIBitma
if (!pCharPos) {
return;
}
- FXSYS_memset32(pCharPos, 0, sizeof(FXTEXT_CHARPOS) * iLen);
+ FXSYS_memset(pCharPos, 0, sizeof(FXTEXT_CHARPOS) * iLen);
CFX_FxgeDevice geBitmap;
if (pOutBitmap != NULL) {
geBitmap.Attach(pOutBitmap);
diff --git a/xfa/src/fxbarcode/oned/BC_OnedEAN8Writer.cpp b/xfa/src/fxbarcode/oned/BC_OnedEAN8Writer.cpp
index 4c9e13d131..a247a0670b 100644
--- a/xfa/src/fxbarcode/oned/BC_OnedEAN8Writer.cpp
+++ b/xfa/src/fxbarcode/oned/BC_OnedEAN8Writer.cpp
@@ -169,7 +169,7 @@ void CBC_OnedEAN8Writer::ShowChars(const CFX_WideStringC& contents, CFX_DIBitmap
if (!pCharPos) {
return;
}
- FXSYS_memset32(pCharPos, 0, sizeof(FXTEXT_CHARPOS) * iLength);
+ FXSYS_memset(pCharPos, 0, sizeof(FXTEXT_CHARPOS) * iLength);
CFX_ByteString tempStr = str.Mid(0, 4);
int32_t iLen = tempStr.GetLength();
int32_t strWidth = 7 * multiple * 4;
diff --git a/xfa/src/fxbarcode/oned/BC_OnedUPCAWriter.cpp b/xfa/src/fxbarcode/oned/BC_OnedUPCAWriter.cpp
index 547d87872f..366dc9c67f 100644
--- a/xfa/src/fxbarcode/oned/BC_OnedUPCAWriter.cpp
+++ b/xfa/src/fxbarcode/oned/BC_OnedUPCAWriter.cpp
@@ -119,7 +119,7 @@ void CBC_OnedUPCAWriter::ShowChars(const CFX_WideStringC& contents, CFX_DIBitmap
if (!pCharPos) {
return;
}
- FXSYS_memset32(pCharPos, 0, sizeof(FXTEXT_CHARPOS) * iLen);
+ FXSYS_memset(pCharPos, 0, sizeof(FXTEXT_CHARPOS) * iLen);
CFX_ByteString tempStr = str.Mid(1, 5);
FX_FLOAT strWidth = (FX_FLOAT)35 * multiple;
FX_FLOAT blank = 0.0;
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)
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);
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 22:08:54 +0000