summaryrefslogtreecommitdiff
path: root/fxbarcode/oned
diff options
context:
space:
mode:
Diffstat (limited to 'fxbarcode/oned')
-rw-r--r--fxbarcode/oned/BC_OneDimWriter.cpp6
-rw-r--r--fxbarcode/oned/BC_OneDimWriter.h2
-rw-r--r--fxbarcode/oned/BC_OnedCodaBarWriter.cpp4
-rw-r--r--fxbarcode/oned/BC_OnedCode128Writer.cpp11
-rw-r--r--fxbarcode/oned/BC_OnedCode39Writer.cpp39
-rw-r--r--fxbarcode/oned/BC_OnedEAN13Writer.cpp11
-rw-r--r--fxbarcode/oned/BC_OnedEAN8Writer.cpp14
-rw-r--r--fxbarcode/oned/BC_OnedUPCAWriter.cpp6
8 files changed, 43 insertions, 50 deletions
diff --git a/fxbarcode/oned/BC_OneDimWriter.cpp b/fxbarcode/oned/BC_OneDimWriter.cpp
index 69c031608c..2927dda3af 100644
--- a/fxbarcode/oned/BC_OneDimWriter.cpp
+++ b/fxbarcode/oned/BC_OneDimWriter.cpp
@@ -136,10 +136,10 @@ void CBC_OneDimWriter::CalcTextInfo(const CFX_ByteString& text,
std::unique_ptr<CFX_UnicodeEncodingEx> encoding =
FX_CreateFontEncodingEx(cFont, FXFM_ENCODING_NONE);
- int32_t length = text.GetLength();
+ FX_STRSIZE length = text.GetLength();
uint32_t* pCharCode = FX_Alloc(uint32_t, text.GetLength());
float charWidth = 0;
- for (int32_t j = 0; j < text.GetLength(); j++) {
+ for (FX_STRSIZE j = 0; j < length; j++) {
pCharCode[j] = encoding->CharCodeFromUnicode(text[j]);
int32_t glyp_code = encoding->GlyphFromCharCode(pCharCode[j]);
int32_t glyp_value = cFont->GetGlyphWidth(glyp_code);
@@ -162,7 +162,7 @@ void CBC_OneDimWriter::CalcTextInfo(const CFX_ByteString& text,
charPos[0].m_ExtGID = charPos[0].m_GlyphIndex;
#endif
penX += (float)(charPos[0].m_FontCharWidth) * (float)fontSize / 1000.0f;
- for (int32_t i = 1; i < length; i++) {
+ for (FX_STRSIZE i = 1; i < length; i++) {
charPos[i].m_Origin = CFX_PointF(penX + left, penY + top);
charPos[i].m_GlyphIndex = encoding->GlyphFromCharCode(pCharCode[i]);
charPos[i].m_FontCharWidth = cFont->GetGlyphWidth(charPos[i].m_GlyphIndex);
diff --git a/fxbarcode/oned/BC_OneDimWriter.h b/fxbarcode/oned/BC_OneDimWriter.h
index d81a3e0a0a..c220f382ee 100644
--- a/fxbarcode/oned/BC_OneDimWriter.h
+++ b/fxbarcode/oned/BC_OneDimWriter.h
@@ -92,7 +92,7 @@ class CBC_OneDimWriter : public CBC_Writer {
int32_t m_iFontStyle;
uint32_t m_fontColor;
BC_TEXT_LOC m_locTextLoc;
- int32_t m_iContentLen;
+ FX_STRSIZE m_iContentLen;
bool m_bLeftPadding;
bool m_bRightPadding;
std::vector<CFX_PathData> m_output;
diff --git a/fxbarcode/oned/BC_OnedCodaBarWriter.cpp b/fxbarcode/oned/BC_OnedCodaBarWriter.cpp
index ecaeb8d656..5a56acb37c 100644
--- a/fxbarcode/oned/BC_OnedCodaBarWriter.cpp
+++ b/fxbarcode/oned/BC_OnedCodaBarWriter.cpp
@@ -105,7 +105,7 @@ CFX_WideString CBC_OnedCodaBarWriter::FilterContents(
const CFX_WideStringC& contents) {
CFX_WideString filtercontents;
wchar_t ch;
- for (int32_t index = 0; index < contents.GetLength(); index++) {
+ for (FX_STRSIZE index = 0; index < contents.GetLength(); index++) {
ch = contents[index];
if (ch > 175) {
index++;
@@ -136,7 +136,7 @@ uint8_t* CBC_OnedCodaBarWriter::EncodeImpl(const CFX_ByteString& contents,
uint8_t* result = FX_Alloc2D(uint8_t, m_iWideNarrRatio * 7, data.GetLength());
char ch;
int32_t position = 0;
- for (int32_t index = 0; index < data.GetLength(); index++) {
+ for (FX_STRSIZE index = 0; index < data.GetLength(); index++) {
ch = data[index];
if (((ch >= 'a') && (ch <= 'z'))) {
ch = ch - 32;
diff --git a/fxbarcode/oned/BC_OnedCode128Writer.cpp b/fxbarcode/oned/BC_OnedCode128Writer.cpp
index a6dc749a76..1e9f98b9e7 100644
--- a/fxbarcode/oned/BC_OnedCode128Writer.cpp
+++ b/fxbarcode/oned/BC_OnedCode128Writer.cpp
@@ -96,7 +96,7 @@ bool CBC_OnedCode128Writer::CheckContentValidity(
CFX_WideString CBC_OnedCode128Writer::FilterContents(
const CFX_WideStringC& contents) {
CFX_WideString filterChineseChar;
- for (int32_t i = 0; i < contents.GetLength(); i++) {
+ for (FX_STRSIZE i = 0; i < contents.GetLength(); i++) {
wchar_t ch = contents[i];
if (ch > 175) {
i++;
@@ -173,9 +173,8 @@ int32_t CBC_OnedCode128Writer::Encode128B(const CFX_ByteString& contents,
int32_t checkWeight = 1;
patterns->push_back(CODE_START_B);
int32_t checkSum = CODE_START_B * checkWeight;
- int32_t position = 0;
- while (position < contents.GetLength()) {
- int32_t patternIndex = contents[position++] - ' ';
+ for (FX_STRSIZE position = 0; position < contents.GetLength(); position++) {
+ int32_t patternIndex = contents[position] - ' ';
patterns->push_back(patternIndex);
checkSum += patternIndex * checkWeight++;
}
@@ -188,13 +187,13 @@ int32_t CBC_OnedCode128Writer::Encode128C(const CFX_ByteString& contents,
int32_t checkWeight = 1;
patterns->push_back(CODE_START_C);
int32_t checkSum = CODE_START_C * checkWeight;
- int32_t position = 0;
+ FX_STRSIZE position = 0;
while (position < contents.GetLength()) {
int32_t patternIndex;
char ch = contents[position];
if (std::isdigit(ch)) {
patternIndex = FXSYS_atoi(
- contents.Mid(position, position + 1 < contents.GetLength() ? 2 : 1)
+ contents.Mid(position, contents.IsValidIndex(position + 1) ? 2 : 1)
.c_str());
++position;
if (position < contents.GetLength() && std::isdigit(contents[position]))
diff --git a/fxbarcode/oned/BC_OnedCode39Writer.cpp b/fxbarcode/oned/BC_OnedCode39Writer.cpp
index cd87231fdf..ba8769ed95 100644
--- a/fxbarcode/oned/BC_OnedCode39Writer.cpp
+++ b/fxbarcode/oned/BC_OnedCode39Writer.cpp
@@ -49,13 +49,11 @@ CBC_OnedCode39Writer::~CBC_OnedCode39Writer() {}
bool CBC_OnedCode39Writer::CheckContentValidity(
const CFX_WideStringC& contents) {
- for (int32_t i = 0; i < contents.GetLength(); i++) {
+ for (FX_STRSIZE i = 0; i < contents.GetLength(); i++) {
wchar_t ch = contents[i];
- if ((ch >= (wchar_t)'0' && ch <= (wchar_t)'9') ||
- (ch >= (wchar_t)'A' && ch <= (wchar_t)'Z') || ch == (wchar_t)'-' ||
- ch == (wchar_t)'.' || ch == (wchar_t)' ' || ch == (wchar_t)'*' ||
- ch == (wchar_t)'$' || ch == (wchar_t)'/' || ch == (wchar_t)'+' ||
- ch == (wchar_t)'%') {
+ if ((ch >= L'0' && ch <= L'9') || (ch >= L'A' && ch <= L'Z') ||
+ ch == L'-' || ch == L'.' || ch == L' ' || ch == L'*' || ch == L'$' ||
+ ch == L'/' || ch == L'+' || ch == L'%') {
continue;
}
return false;
@@ -66,9 +64,9 @@ bool CBC_OnedCode39Writer::CheckContentValidity(
CFX_WideString CBC_OnedCode39Writer::FilterContents(
const CFX_WideStringC& contents) {
CFX_WideString filtercontents;
- for (int32_t i = 0; i < contents.GetLength(); i++) {
+ for (FX_STRSIZE i = 0; i < contents.GetLength(); i++) {
wchar_t ch = contents[i];
- if (ch == (wchar_t)'*' && (i == 0 || i == contents.GetLength() - 1)) {
+ if (ch == L'*' && (i == 0 || i == contents.GetLength() - 1)) {
continue;
}
if (ch > 175) {
@@ -77,11 +75,9 @@ CFX_WideString CBC_OnedCode39Writer::FilterContents(
} else {
ch = Upper(ch);
}
- if ((ch >= (wchar_t)'0' && ch <= (wchar_t)'9') ||
- (ch >= (wchar_t)'A' && ch <= (wchar_t)'Z') || ch == (wchar_t)'-' ||
- ch == (wchar_t)'.' || ch == (wchar_t)' ' || ch == (wchar_t)'*' ||
- ch == (wchar_t)'$' || ch == (wchar_t)'/' || ch == (wchar_t)'+' ||
- ch == (wchar_t)'%') {
+ if ((ch >= L'0' && ch <= L'9') || (ch >= L'A' && ch <= L'Z') ||
+ ch == L'-' || ch == L'.' || ch == L' ' || ch == L'*' || ch == L'$' ||
+ ch == L'/' || ch == L'+' || ch == L'%') {
filtercontents += ch;
}
}
@@ -91,21 +87,18 @@ CFX_WideString CBC_OnedCode39Writer::FilterContents(
CFX_WideString CBC_OnedCode39Writer::RenderTextContents(
const CFX_WideStringC& contents) {
CFX_WideString renderContents;
- for (int32_t i = 0; i < contents.GetLength(); i++) {
+ for (FX_STRSIZE i = 0; i < contents.GetLength(); i++) {
wchar_t ch = contents[i];
- if (ch == (wchar_t)'*' && (i == 0 || i == contents.GetLength() - 1)) {
+ if (ch == L'*' && (i == 0 || i == contents.GetLength() - 1)) {
continue;
}
if (ch > 175) {
i++;
continue;
}
- if ((ch >= (wchar_t)'0' && ch <= (wchar_t)'9') ||
- (ch >= (wchar_t)'A' && ch <= (wchar_t)'Z') ||
- (ch >= (wchar_t)'a' && ch <= (wchar_t)'z') || ch == (wchar_t)'-' ||
- ch == (wchar_t)'.' || ch == (wchar_t)' ' || ch == (wchar_t)'*' ||
- ch == (wchar_t)'$' || ch == (wchar_t)'/' || ch == (wchar_t)'+' ||
- ch == (wchar_t)'%') {
+ if ((ch >= L'0' && ch <= L'9') || (ch >= L'A' && ch <= L'Z') ||
+ (ch >= L'a' && ch <= L'z') || ch == L'-' || ch == L'.' || ch == L' ' ||
+ ch == L'*' || ch == L'$' || ch == L'/' || ch == L'+' || ch == L'%') {
renderContents += ch;
}
}
@@ -145,7 +138,7 @@ void CBC_OnedCode39Writer::ToIntArray(int32_t a, int8_t* toReturn) {
}
char CBC_OnedCode39Writer::CalcCheckSum(const CFX_ByteString& contents) {
- int32_t length = contents.GetLength();
+ FX_STRSIZE length = contents.GetLength();
if (length > 80)
return '*';
@@ -183,7 +176,7 @@ uint8_t* CBC_OnedCode39Writer::EncodeImpl(const CFX_ByteString& contents,
int32_t codeWidth = (wideStrideNum * m_iWideNarrRatio + narrStrideNum) * 2 +
1 + m_iContentLen;
size_t len = strlen(ALPHABET_STRING);
- for (int32_t j = 0; j < m_iContentLen; j++) {
+ for (FX_STRSIZE j = 0; j < m_iContentLen; j++) {
for (size_t i = 0; i < len; i++) {
if (ALPHABET_STRING[i] != encodedContents[j])
continue;
diff --git a/fxbarcode/oned/BC_OnedEAN13Writer.cpp b/fxbarcode/oned/BC_OnedEAN13Writer.cpp
index 9149982ebe..5dd10ab4fc 100644
--- a/fxbarcode/oned/BC_OnedEAN13Writer.cpp
+++ b/fxbarcode/oned/BC_OnedEAN13Writer.cpp
@@ -63,7 +63,7 @@ CFX_WideString CBC_OnedEAN13Writer::FilterContents(
const CFX_WideStringC& contents) {
CFX_WideString filtercontents;
wchar_t ch;
- for (int32_t i = 0; i < contents.GetLength(); i++) {
+ for (FX_STRSIZE i = 0; i < contents.GetLength(); i++) {
ch = contents[i];
if (ch > 175) {
i++;
@@ -78,12 +78,13 @@ CFX_WideString CBC_OnedEAN13Writer::FilterContents(
int32_t CBC_OnedEAN13Writer::CalcChecksum(const CFX_ByteString& contents) {
int32_t odd = 0;
int32_t even = 0;
- int32_t j = 1;
- for (int32_t i = contents.GetLength() - 1; i >= 0; i--) {
+ FX_STRSIZE j = 1;
+ for (FX_STRSIZE i = 0; i < contents.GetLength(); i++) {
+ FX_STRSIZE rev_i = (contents.GetLength() - 1) - 1;
if (j % 2) {
- odd += FXSYS_atoi(contents.Mid(i, 1).c_str());
+ odd += FXSYS_atoi(contents.Mid(i, rev_i).c_str());
} else {
- even += FXSYS_atoi(contents.Mid(i, 1).c_str());
+ even += FXSYS_atoi(contents.Mid(i, rev_i).c_str());
}
j++;
}
diff --git a/fxbarcode/oned/BC_OnedEAN8Writer.cpp b/fxbarcode/oned/BC_OnedEAN8Writer.cpp
index 0ddafd6f17..5ca53e0568 100644
--- a/fxbarcode/oned/BC_OnedEAN8Writer.cpp
+++ b/fxbarcode/oned/BC_OnedEAN8Writer.cpp
@@ -69,7 +69,7 @@ CFX_WideString CBC_OnedEAN8Writer::FilterContents(
const CFX_WideStringC& contents) {
CFX_WideString filtercontents;
wchar_t ch;
- for (int32_t i = 0; i < contents.GetLength(); i++) {
+ for (FX_STRSIZE i = 0; i < contents.GetLength(); i++) {
ch = contents[i];
if (ch > 175) {
i++;
@@ -83,10 +83,10 @@ CFX_WideString CBC_OnedEAN8Writer::FilterContents(
}
int32_t CBC_OnedEAN8Writer::CalcChecksum(const CFX_ByteString& contents) {
- int32_t odd = 0;
- int32_t even = 0;
- int32_t j = 1;
- for (int32_t i = contents.GetLength() - 1; i >= 0; i--) {
+ FX_STRSIZE odd = 0;
+ FX_STRSIZE even = 0;
+ FX_STRSIZE j = 1;
+ for (FX_STRSIZE i = contents.GetLength() - 1; i >= 0; i--) {
if (j % 2) {
odd += FXSYS_atoi(contents.Mid(i, 1).c_str());
} else {
@@ -157,10 +157,10 @@ bool CBC_OnedEAN8Writer::ShowChars(const CFX_WideStringC& contents,
int32_t leftPosition = 3 * multiple;
CFX_ByteString str = FX_UTF8Encode(contents);
- int32_t iLength = str.GetLength();
+ FX_STRSIZE iLength = str.GetLength();
std::vector<FXTEXT_CHARPOS> charpos(iLength);
CFX_ByteString tempStr = str.Left(4);
- int32_t iLen = tempStr.GetLength();
+ FX_STRSIZE iLen = tempStr.GetLength();
int32_t strWidth = 7 * multiple * 4;
float blank = 0.0;
diff --git a/fxbarcode/oned/BC_OnedUPCAWriter.cpp b/fxbarcode/oned/BC_OnedUPCAWriter.cpp
index 07c3e7f174..87b68d364f 100644
--- a/fxbarcode/oned/BC_OnedUPCAWriter.cpp
+++ b/fxbarcode/oned/BC_OnedUPCAWriter.cpp
@@ -53,7 +53,7 @@ CFX_WideString CBC_OnedUPCAWriter::FilterContents(
const CFX_WideStringC& contents) {
CFX_WideString filtercontents;
wchar_t ch;
- for (int32_t i = 0; i < contents.GetLength(); i++) {
+ for (FX_STRSIZE i = 0; i < contents.GetLength(); i++) {
ch = contents[i];
if (ch > 175) {
i++;
@@ -69,8 +69,8 @@ CFX_WideString CBC_OnedUPCAWriter::FilterContents(
int32_t CBC_OnedUPCAWriter::CalcChecksum(const CFX_ByteString& contents) {
int32_t odd = 0;
int32_t even = 0;
- int32_t j = 1;
- for (int32_t i = contents.GetLength() - 1; i >= 0; i--) {
+ FX_STRSIZE j = 1;
+ for (FX_STRSIZE i = contents.GetLength() - 1; i >= 0; i--) {
if (j % 2) {
odd += FXSYS_atoi(contents.Mid(i, 1).c_str());
} else {
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 15:22:56 +0000