summaryrefslogtreecommitdiff
path: root/fxbarcode
diff options
context:
space:
mode:
Diffstat (limited to 'fxbarcode')
-rw-r--r--fxbarcode/common/BC_CommonBitMatrix.cpp6
-rw-r--r--fxbarcode/common/BC_CommonByteArray.cpp12
-rw-r--r--fxbarcode/common/BC_CommonByteMatrix.cpp2
-rw-r--r--fxbarcode/datamatrix/BC_DataMatrixWriter.cpp2
-rw-r--r--fxbarcode/datamatrix/BC_ErrorCorrection.cpp2
-rw-r--r--fxbarcode/oned/BC_OneDimWriter.cpp2
-rw-r--r--fxbarcode/oned/BC_OnedEAN13Writer.cpp2
-rw-r--r--fxbarcode/oned/BC_OnedEAN8Writer.cpp2
-rw-r--r--fxbarcode/oned/BC_OnedUPCAWriter.cpp2
-rw-r--r--fxbarcode/pdf417/BC_PDF417ErrorCorrection.cpp2
-rw-r--r--fxbarcode/pdf417/BC_PDF417Writer.cpp2
-rw-r--r--fxbarcode/qrcode/BC_QRCodeWriter.cpp2
-rw-r--r--fxbarcode/qrcode/BC_QRCoderBitVector.cpp2
13 files changed, 20 insertions, 20 deletions
diff --git a/fxbarcode/common/BC_CommonBitMatrix.cpp b/fxbarcode/common/BC_CommonBitMatrix.cpp
index 95f5e4640e..a3e20ed28e 100644
--- a/fxbarcode/common/BC_CommonBitMatrix.cpp
+++ b/fxbarcode/common/BC_CommonBitMatrix.cpp
@@ -36,7 +36,7 @@ void CBC_CommonBitMatrix::Init(int32_t dimension) {
int32_t rowSize = (m_height + 31) >> 5;
m_rowSize = rowSize;
m_bits = FX_Alloc2D(int32_t, m_rowSize, m_height);
- FXSYS_memset(m_bits, 0, m_rowSize * m_height * sizeof(int32_t));
+ memset(m_bits, 0, m_rowSize * m_height * sizeof(int32_t));
}
void CBC_CommonBitMatrix::Init(int32_t width, int32_t height) {
m_width = width;
@@ -44,7 +44,7 @@ void CBC_CommonBitMatrix::Init(int32_t width, int32_t height) {
int32_t rowSize = (width + 31) >> 5;
m_rowSize = rowSize;
m_bits = FX_Alloc2D(int32_t, m_rowSize, m_height);
- FXSYS_memset(m_bits, 0, m_rowSize * m_height * sizeof(int32_t));
+ memset(m_bits, 0, m_rowSize * m_height * sizeof(int32_t));
}
CBC_CommonBitMatrix::~CBC_CommonBitMatrix() {
FX_Free(m_bits);
@@ -71,7 +71,7 @@ void CBC_CommonBitMatrix::Flip(int32_t x, int32_t y) {
m_bits[offset] ^= 1 << (x & 0x1f);
}
void CBC_CommonBitMatrix::Clear() {
- FXSYS_memset(m_bits, 0, m_rowSize * m_height * sizeof(int32_t));
+ memset(m_bits, 0, m_rowSize * m_height * sizeof(int32_t));
}
void CBC_CommonBitMatrix::SetRegion(int32_t left,
int32_t top,
diff --git a/fxbarcode/common/BC_CommonByteArray.cpp b/fxbarcode/common/BC_CommonByteArray.cpp
index a271de6015..b670ba3b75 100644
--- a/fxbarcode/common/BC_CommonByteArray.cpp
+++ b/fxbarcode/common/BC_CommonByteArray.cpp
@@ -32,13 +32,13 @@ CBC_CommonByteArray::CBC_CommonByteArray() {
CBC_CommonByteArray::CBC_CommonByteArray(int32_t size) {
m_size = size;
m_bytes = FX_Alloc(uint8_t, size);
- FXSYS_memset(m_bytes, 0, size);
+ 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_memcpy(m_bytes, byteArray, size);
+ memcpy(m_bytes, byteArray, size);
m_index = size;
}
CBC_CommonByteArray::~CBC_CommonByteArray() {
@@ -68,10 +68,10 @@ void CBC_CommonByteArray::Reserve(int32_t capacity) {
if (!m_bytes || m_size < capacity) {
uint8_t* newArray = FX_Alloc(uint8_t, capacity);
if (m_bytes) {
- FXSYS_memcpy(newArray, m_bytes, m_size);
- FXSYS_memset(newArray + m_size, 0, capacity - m_size);
+ memcpy(newArray, m_bytes, m_size);
+ memset(newArray + m_size, 0, capacity - m_size);
} else {
- FXSYS_memset(newArray, 0, capacity);
+ memset(newArray, 0, capacity);
}
FX_Free(m_bytes);
m_bytes = newArray;
@@ -82,7 +82,7 @@ void CBC_CommonByteArray::Set(uint8_t* source, int32_t offset, int32_t count) {
FX_Free(m_bytes);
m_bytes = FX_Alloc(uint8_t, count);
m_size = count;
- FXSYS_memcpy(m_bytes, source + offset, count);
+ memcpy(m_bytes, source + offset, count);
m_index = count;
}
void CBC_CommonByteArray::Set(std::vector<uint8_t>* source,
diff --git a/fxbarcode/common/BC_CommonByteMatrix.cpp b/fxbarcode/common/BC_CommonByteMatrix.cpp
index 44c783248f..2ab1e9ac50 100644
--- a/fxbarcode/common/BC_CommonByteMatrix.cpp
+++ b/fxbarcode/common/BC_CommonByteMatrix.cpp
@@ -30,7 +30,7 @@ CBC_CommonByteMatrix::CBC_CommonByteMatrix(int32_t width, int32_t height) {
}
void CBC_CommonByteMatrix::Init() {
m_bytes = FX_Alloc2D(uint8_t, m_height, m_width);
- FXSYS_memset(m_bytes, 0xff, m_height * m_width);
+ memset(m_bytes, 0xff, m_height * m_width);
}
CBC_CommonByteMatrix::~CBC_CommonByteMatrix() {
FX_Free(m_bytes);
diff --git a/fxbarcode/datamatrix/BC_DataMatrixWriter.cpp b/fxbarcode/datamatrix/BC_DataMatrixWriter.cpp
index 3b1b9641d1..0dcba84979 100644
--- a/fxbarcode/datamatrix/BC_DataMatrixWriter.cpp
+++ b/fxbarcode/datamatrix/BC_DataMatrixWriter.cpp
@@ -85,7 +85,7 @@ uint8_t* CBC_DataMatrixWriter::Encode(const CFX_WideString& contents,
outWidth = bytematrix->GetWidth();
outHeight = bytematrix->GetHeight();
uint8_t* result = FX_Alloc2D(uint8_t, outWidth, outHeight);
- FXSYS_memcpy(result, bytematrix->GetArray(), outWidth * outHeight);
+ memcpy(result, bytematrix->GetArray(), outWidth * outHeight);
delete bytematrix;
delete placement;
return result;
diff --git a/fxbarcode/datamatrix/BC_ErrorCorrection.cpp b/fxbarcode/datamatrix/BC_ErrorCorrection.cpp
index 72ce8fcdf3..43bdc24534 100644
--- a/fxbarcode/datamatrix/BC_ErrorCorrection.cpp
+++ b/fxbarcode/datamatrix/BC_ErrorCorrection.cpp
@@ -183,7 +183,7 @@ CFX_WideString CBC_ErrorCorrection::createECCBlock(CFX_WideString codewords,
return CFX_WideString();
}
uint16_t* ecc = FX_Alloc(uint16_t, numECWords);
- FXSYS_memset(ecc, 0, numECWords * sizeof(uint16_t));
+ memset(ecc, 0, numECWords * sizeof(uint16_t));
for (int32_t l = start; l < start + len; l++) {
uint16_t m = ecc[numECWords - 1] ^ codewords.GetAt(l);
for (int32_t k = numECWords - 1; k > 0; k--) {
diff --git a/fxbarcode/oned/BC_OneDimWriter.cpp b/fxbarcode/oned/BC_OneDimWriter.cpp
index ecefec2f0a..95244ae614 100644
--- a/fxbarcode/oned/BC_OneDimWriter.cpp
+++ b/fxbarcode/oned/BC_OneDimWriter.cpp
@@ -265,7 +265,7 @@ void CBC_OneDimWriter::ShowChars(const CFX_WideStringC& contents,
CFX_ByteString str = FX_UTF8Encode(contents);
int32_t iLen = str.GetLength();
FXTEXT_CHARPOS* pCharPos = FX_Alloc(FXTEXT_CHARPOS, iLen);
- FXSYS_memset(pCharPos, 0, sizeof(FXTEXT_CHARPOS) * iLen);
+ memset(pCharPos, 0, sizeof(FXTEXT_CHARPOS) * iLen);
float charsLen = 0;
float geWidth = 0;
if (m_locTextLoc == BC_TEXT_LOC_ABOVEEMBED ||
diff --git a/fxbarcode/oned/BC_OnedEAN13Writer.cpp b/fxbarcode/oned/BC_OnedEAN13Writer.cpp
index 697d8df270..21b0f9a63f 100644
--- a/fxbarcode/oned/BC_OnedEAN13Writer.cpp
+++ b/fxbarcode/oned/BC_OnedEAN13Writer.cpp
@@ -184,7 +184,7 @@ void CBC_OnedEAN13Writer::ShowChars(
CFX_ByteString str = FX_UTF8Encode(contents);
int32_t iLen = str.GetLength();
FXTEXT_CHARPOS* pCharPos = FX_Alloc(FXTEXT_CHARPOS, iLen);
- FXSYS_memset(pCharPos, 0, sizeof(FXTEXT_CHARPOS) * iLen);
+ memset(pCharPos, 0, sizeof(FXTEXT_CHARPOS) * iLen);
CFX_FxgeDevice geBitmap;
if (pOutBitmap)
geBitmap.Attach(pOutBitmap, false, nullptr, false);
diff --git a/fxbarcode/oned/BC_OnedEAN8Writer.cpp b/fxbarcode/oned/BC_OnedEAN8Writer.cpp
index 5d1666da98..5aea9f3c89 100644
--- a/fxbarcode/oned/BC_OnedEAN8Writer.cpp
+++ b/fxbarcode/oned/BC_OnedEAN8Writer.cpp
@@ -182,7 +182,7 @@ void CBC_OnedEAN8Writer::ShowChars(
CFX_ByteString str = FX_UTF8Encode(contents);
int32_t iLength = str.GetLength();
FXTEXT_CHARPOS* pCharPos = FX_Alloc(FXTEXT_CHARPOS, iLength);
- FXSYS_memset(pCharPos, 0, sizeof(FXTEXT_CHARPOS) * iLength);
+ 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/fxbarcode/oned/BC_OnedUPCAWriter.cpp b/fxbarcode/oned/BC_OnedUPCAWriter.cpp
index 588c306b12..87c6db12e1 100644
--- a/fxbarcode/oned/BC_OnedUPCAWriter.cpp
+++ b/fxbarcode/oned/BC_OnedUPCAWriter.cpp
@@ -135,7 +135,7 @@ void CBC_OnedUPCAWriter::ShowChars(
CFX_ByteString str = FX_UTF8Encode(contents);
int32_t iLen = str.GetLength();
FXTEXT_CHARPOS* pCharPos = FX_Alloc(FXTEXT_CHARPOS, iLen);
- FXSYS_memset(pCharPos, 0, sizeof(FXTEXT_CHARPOS) * iLen);
+ memset(pCharPos, 0, sizeof(FXTEXT_CHARPOS) * iLen);
CFX_ByteString tempStr = str.Mid(1, 5);
float strWidth = (float)35 * multiple;
float blank = 0.0;
diff --git a/fxbarcode/pdf417/BC_PDF417ErrorCorrection.cpp b/fxbarcode/pdf417/BC_PDF417ErrorCorrection.cpp
index b1fd3d3243..abdd113911 100644
--- a/fxbarcode/pdf417/BC_PDF417ErrorCorrection.cpp
+++ b/fxbarcode/pdf417/BC_PDF417ErrorCorrection.cpp
@@ -164,7 +164,7 @@ CFX_WideString CBC_PDF417ErrorCorrection::generateErrorCorrection(
if (e != BCExceptionNO)
return L" ";
wchar_t* ech = FX_Alloc(wchar_t, k);
- FXSYS_memset(ech, 0, k * sizeof(wchar_t));
+ memset(ech, 0, k * sizeof(wchar_t));
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/fxbarcode/pdf417/BC_PDF417Writer.cpp b/fxbarcode/pdf417/BC_PDF417Writer.cpp
index aa5a92361e..5344b8aecf 100644
--- a/fxbarcode/pdf417/BC_PDF417Writer.cpp
+++ b/fxbarcode/pdf417/BC_PDF417Writer.cpp
@@ -97,7 +97,7 @@ uint8_t* CBC_PDF417Writer::Encode(const CFX_WideString& contents,
}
}
uint8_t* result = FX_Alloc2D(uint8_t, outHeight, outWidth);
- FXSYS_memcpy(result, originalScale.data(), outHeight * outWidth);
+ memcpy(result, originalScale.data(), outHeight * outWidth);
return result;
}
void CBC_PDF417Writer::rotateArray(std::vector<uint8_t>& bitarray,
diff --git a/fxbarcode/qrcode/BC_QRCodeWriter.cpp b/fxbarcode/qrcode/BC_QRCodeWriter.cpp
index ac23462ed8..b83bca89c8 100644
--- a/fxbarcode/qrcode/BC_QRCodeWriter.cpp
+++ b/fxbarcode/qrcode/BC_QRCodeWriter.cpp
@@ -100,7 +100,7 @@ uint8_t* CBC_QRCodeWriter::Encode(const CFX_WideString& contents,
outWidth = qr.GetMatrixWidth();
outHeight = qr.GetMatrixWidth();
uint8_t* result = FX_Alloc2D(uint8_t, outWidth, outHeight);
- FXSYS_memcpy(result, qr.GetMatrix()->GetArray(), outWidth * outHeight);
+ memcpy(result, qr.GetMatrix()->GetArray(), outWidth * outHeight);
return result;
}
diff --git a/fxbarcode/qrcode/BC_QRCoderBitVector.cpp b/fxbarcode/qrcode/BC_QRCoderBitVector.cpp
index 08222093a5..2e3c341792 100644
--- a/fxbarcode/qrcode/BC_QRCoderBitVector.cpp
+++ b/fxbarcode/qrcode/BC_QRCoderBitVector.cpp
@@ -117,7 +117,7 @@ uint8_t* CBC_QRCoderBitVector::GetArray() {
void CBC_QRCoderBitVector::AppendByte(int32_t value) {
if ((m_sizeInBits >> 3) == m_size) {
uint8_t* newArray = FX_Alloc(uint8_t, m_size << 1);
- FXSYS_memcpy(newArray, m_array, m_size);
+ memcpy(newArray, m_array, m_size);
FX_Free(m_array);
m_array = newArray;
m_size = m_size << 1;