summaryrefslogtreecommitdiff
path: root/fxbarcode/datamatrix/BC_SymbolInfo.cpp
diff options
context:
space:
mode:
authorLei Zhang <thestig@chromium.org>2017-05-22 18:47:12 -0700
committerChromium commit bot <commit-bot@chromium.org>2017-05-23 21:17:23 +0000
commitabc83aa862050642a90ed109074a9cf1018fee9b (patch)
treeb842d471c3cc49a0268a0647ca4c574248610ae9 /fxbarcode/datamatrix/BC_SymbolInfo.cpp
parente0f1310795f1cf886b9b2a134b28ace9e8fc25ba (diff)
downloadpdfium-abc83aa862050642a90ed109074a9cf1018fee9b.tar.xz
Clean up CBC_SymbolInfo.chromium/3109
- Remove rectangular ctor param. It can be derived from dimensions. - Make members private and add accessors. - Remove exceptions that cannot occur. Change-Id: Iec113205241562a0559e594fe257f5b9064ed97e Reviewed-on: https://pdfium-review.googlesource.com/5737 Reviewed-by: Tom Sepez <tsepez@chromium.org> Commit-Queue: Lei Zhang <thestig@chromium.org>
Diffstat (limited to 'fxbarcode/datamatrix/BC_SymbolInfo.cpp')
-rw-r--r--fxbarcode/datamatrix/BC_SymbolInfo.cpp149
1 files changed, 79 insertions, 70 deletions
diff --git a/fxbarcode/datamatrix/BC_SymbolInfo.cpp b/fxbarcode/datamatrix/BC_SymbolInfo.cpp
index 5d12f1c090..1d5a84f5c4 100644
--- a/fxbarcode/datamatrix/BC_SymbolInfo.cpp
+++ b/fxbarcode/datamatrix/BC_SymbolInfo.cpp
@@ -41,35 +41,35 @@ CBC_SymbolInfo* g_symbols[kSymbolsCount] = {
} // namespace
void CBC_SymbolInfo::Initialize() {
- g_symbols[0] = new CBC_SymbolInfo(false, 3, 5, 8, 8, 1);
- g_symbols[1] = new CBC_SymbolInfo(false, 5, 7, 10, 10, 1);
- g_symbols[2] = new CBC_SymbolInfo(true, 5, 7, 16, 6, 1);
- g_symbols[3] = new CBC_SymbolInfo(false, 8, 10, 12, 12, 1);
- g_symbols[4] = new CBC_SymbolInfo(true, 10, 11, 14, 6, 2);
- g_symbols[5] = new CBC_SymbolInfo(false, 12, 12, 14, 14, 1);
- g_symbols[6] = new CBC_SymbolInfo(true, 16, 14, 24, 10, 1);
- g_symbols[7] = new CBC_SymbolInfo(false, 18, 14, 16, 16, 1);
- g_symbols[8] = new CBC_SymbolInfo(false, 22, 18, 18, 18, 1);
- g_symbols[9] = new CBC_SymbolInfo(true, 22, 18, 16, 10, 2);
- g_symbols[10] = new CBC_SymbolInfo(false, 30, 20, 20, 20, 1);
- g_symbols[11] = new CBC_SymbolInfo(true, 32, 24, 16, 14, 2);
- g_symbols[12] = new CBC_SymbolInfo(false, 36, 24, 22, 22, 1);
- g_symbols[13] = new CBC_SymbolInfo(false, 44, 28, 24, 24, 1);
- g_symbols[14] = new CBC_SymbolInfo(true, 49, 28, 22, 14, 2);
- g_symbols[15] = new CBC_SymbolInfo(false, 62, 36, 14, 14, 4);
- g_symbols[16] = new CBC_SymbolInfo(false, 86, 42, 16, 16, 4);
- g_symbols[17] = new CBC_SymbolInfo(false, 114, 48, 18, 18, 4);
- g_symbols[18] = new CBC_SymbolInfo(false, 144, 56, 20, 20, 4);
- g_symbols[19] = new CBC_SymbolInfo(false, 174, 68, 22, 22, 4);
- g_symbols[20] = new CBC_SymbolInfo(false, 204, 84, 24, 24, 4, 102, 42);
- g_symbols[21] = new CBC_SymbolInfo(false, 280, 112, 14, 14, 16, 140, 56);
- g_symbols[22] = new CBC_SymbolInfo(false, 368, 144, 16, 16, 16, 92, 36);
- g_symbols[23] = new CBC_SymbolInfo(false, 456, 192, 18, 18, 16, 114, 48);
- g_symbols[24] = new CBC_SymbolInfo(false, 576, 224, 20, 20, 16, 144, 56);
- g_symbols[25] = new CBC_SymbolInfo(false, 696, 272, 22, 22, 16, 174, 68);
- g_symbols[26] = new CBC_SymbolInfo(false, 816, 336, 24, 24, 16, 136, 56);
- g_symbols[27] = new CBC_SymbolInfo(false, 1050, 408, 18, 18, 36, 175, 68);
- g_symbols[28] = new CBC_SymbolInfo(false, 1304, 496, 20, 20, 36, 163, 62);
+ g_symbols[0] = new CBC_SymbolInfo(3, 5, 8, 8, 1);
+ g_symbols[1] = new CBC_SymbolInfo(5, 7, 10, 10, 1);
+ g_symbols[2] = new CBC_SymbolInfo(5, 7, 16, 6, 1);
+ g_symbols[3] = new CBC_SymbolInfo(8, 10, 12, 12, 1);
+ g_symbols[4] = new CBC_SymbolInfo(10, 11, 14, 6, 2);
+ g_symbols[5] = new CBC_SymbolInfo(12, 12, 14, 14, 1);
+ g_symbols[6] = new CBC_SymbolInfo(16, 14, 24, 10, 1);
+ g_symbols[7] = new CBC_SymbolInfo(18, 14, 16, 16, 1);
+ g_symbols[8] = new CBC_SymbolInfo(22, 18, 18, 18, 1);
+ g_symbols[9] = new CBC_SymbolInfo(22, 18, 16, 10, 2);
+ g_symbols[10] = new CBC_SymbolInfo(30, 20, 20, 20, 1);
+ g_symbols[11] = new CBC_SymbolInfo(32, 24, 16, 14, 2);
+ g_symbols[12] = new CBC_SymbolInfo(36, 24, 22, 22, 1);
+ g_symbols[13] = new CBC_SymbolInfo(44, 28, 24, 24, 1);
+ g_symbols[14] = new CBC_SymbolInfo(49, 28, 22, 14, 2);
+ g_symbols[15] = new CBC_SymbolInfo(62, 36, 14, 14, 4);
+ g_symbols[16] = new CBC_SymbolInfo(86, 42, 16, 16, 4);
+ g_symbols[17] = new CBC_SymbolInfo(114, 48, 18, 18, 4);
+ g_symbols[18] = new CBC_SymbolInfo(144, 56, 20, 20, 4);
+ g_symbols[19] = new CBC_SymbolInfo(174, 68, 22, 22, 4);
+ g_symbols[20] = new CBC_SymbolInfo(204, 84, 24, 24, 4, 102, 42);
+ g_symbols[21] = new CBC_SymbolInfo(280, 112, 14, 14, 16, 140, 56);
+ g_symbols[22] = new CBC_SymbolInfo(368, 144, 16, 16, 16, 92, 36);
+ g_symbols[23] = new CBC_SymbolInfo(456, 192, 18, 18, 16, 114, 48);
+ g_symbols[24] = new CBC_SymbolInfo(576, 224, 20, 20, 16, 144, 56);
+ g_symbols[25] = new CBC_SymbolInfo(696, 272, 22, 22, 16, 174, 68);
+ g_symbols[26] = new CBC_SymbolInfo(816, 336, 24, 24, 16, 136, 56);
+ g_symbols[27] = new CBC_SymbolInfo(1050, 408, 18, 18, 36, 175, 68);
+ g_symbols[28] = new CBC_SymbolInfo(1304, 496, 20, 20, 36, 163, 62);
g_symbols[29] = new CBC_DataMatrixSymbolInfo144();
}
@@ -80,48 +80,47 @@ void CBC_SymbolInfo::Finalize() {
}
}
-CBC_SymbolInfo::CBC_SymbolInfo(bool rectangular,
- int32_t dataCapacity,
+CBC_SymbolInfo::CBC_SymbolInfo(int32_t dataCapacity,
int32_t errorCodewords,
int32_t matrixWidth,
int32_t matrixHeight,
- int32_t dataRegions) {
- m_rectangular = rectangular;
- m_dataCapacity = dataCapacity;
- m_errorCodewords = errorCodewords;
- m_matrixWidth = matrixWidth;
- m_matrixHeight = matrixHeight;
- m_dataRegions = dataRegions;
- m_rsBlockData = dataCapacity;
- m_rsBlockError = errorCodewords;
-}
-CBC_SymbolInfo::CBC_SymbolInfo(bool rectangular,
- int32_t dataCapacity,
+ int32_t dataRegions)
+ : CBC_SymbolInfo(dataCapacity,
+ errorCodewords,
+ matrixWidth,
+ matrixHeight,
+ dataRegions,
+ dataCapacity,
+ errorCodewords) {}
+
+CBC_SymbolInfo::CBC_SymbolInfo(int32_t dataCapacity,
int32_t errorCodewords,
int32_t matrixWidth,
int32_t matrixHeight,
int32_t dataRegions,
int32_t rsBlockData,
- int32_t rsBlockError) {
- m_rectangular = rectangular;
- m_dataCapacity = dataCapacity;
- m_errorCodewords = errorCodewords;
- m_matrixWidth = matrixWidth;
- m_matrixHeight = matrixHeight;
- m_dataRegions = dataRegions;
- m_rsBlockData = rsBlockData;
- m_rsBlockError = rsBlockError;
-}
+ int32_t rsBlockError)
+ : m_rectangular(matrixWidth != matrixHeight),
+ m_dataCapacity(dataCapacity),
+ m_errorCodewords(errorCodewords),
+ m_matrixWidth(matrixWidth),
+ m_matrixHeight(matrixHeight),
+ m_dataRegions(dataRegions),
+ m_rsBlockData(rsBlockData),
+ m_rsBlockError(rsBlockError) {}
+
CBC_SymbolInfo::~CBC_SymbolInfo() {}
CBC_SymbolInfo* CBC_SymbolInfo::lookup(int32_t dataCodewords, int32_t& e) {
return lookup(dataCodewords, FORCE_NONE, true, e);
}
+
CBC_SymbolInfo* CBC_SymbolInfo::lookup(int32_t dataCodewords,
SymbolShapeHint shape,
int32_t& e) {
return lookup(dataCodewords, shape, true, e);
}
+
CBC_SymbolInfo* CBC_SymbolInfo::lookup(int32_t dataCodewords,
bool allowRectangular,
bool fail,
@@ -129,6 +128,7 @@ CBC_SymbolInfo* CBC_SymbolInfo::lookup(int32_t dataCodewords,
SymbolShapeHint shape = allowRectangular ? FORCE_NONE : FORCE_SQUARE;
return lookup(dataCodewords, shape, fail, e);
}
+
CBC_SymbolInfo* CBC_SymbolInfo::lookup(int32_t dataCodewords,
SymbolShapeHint shape,
bool fail,
@@ -139,7 +139,7 @@ CBC_SymbolInfo* CBC_SymbolInfo::lookup(int32_t dataCodewords,
(shape == FORCE_RECTANGLE && !symbol->m_rectangular)) {
continue;
}
- if (dataCodewords <= symbol->m_dataCapacity)
+ if (dataCodewords <= symbol->dataCapacity())
return symbol;
}
if (fail)
@@ -147,7 +147,7 @@ CBC_SymbolInfo* CBC_SymbolInfo::lookup(int32_t dataCodewords,
return nullptr;
}
-int32_t CBC_SymbolInfo::getHorizontalDataRegions(int32_t& e) {
+int32_t CBC_SymbolInfo::getHorizontalDataRegions() const {
switch (m_dataRegions) {
case 1:
return 1;
@@ -160,11 +160,12 @@ int32_t CBC_SymbolInfo::getHorizontalDataRegions(int32_t& e) {
case 36:
return 6;
default:
- e = BCExceptionCannotHandleThisNumberOfDataRegions;
+ NOTREACHED();
return 0;
}
}
-int32_t CBC_SymbolInfo::getVerticalDataRegions(int32_t& e) {
+
+int32_t CBC_SymbolInfo::getVerticalDataRegions() const {
switch (m_dataRegions) {
case 1:
return 1;
@@ -177,31 +178,39 @@ int32_t CBC_SymbolInfo::getVerticalDataRegions(int32_t& e) {
case 36:
return 6;
default:
- e = BCExceptionCannotHandleThisNumberOfDataRegions;
+ NOTREACHED();
return 0;
}
}
-int32_t CBC_SymbolInfo::getSymbolDataWidth(int32_t& e) {
- return getHorizontalDataRegions(e) * m_matrixWidth;
+
+int32_t CBC_SymbolInfo::getSymbolDataWidth() const {
+ return getHorizontalDataRegions() * m_matrixWidth;
}
-int32_t CBC_SymbolInfo::getSymbolDataHeight(int32_t& e) {
- return getVerticalDataRegions(e) * m_matrixHeight;
+
+int32_t CBC_SymbolInfo::getSymbolDataHeight() const {
+ return getVerticalDataRegions() * m_matrixHeight;
}
-int32_t CBC_SymbolInfo::getSymbolWidth(int32_t& e) {
- return getSymbolDataWidth(e) + (getHorizontalDataRegions(e) * 2);
+
+int32_t CBC_SymbolInfo::getSymbolWidth() const {
+ return getSymbolDataWidth() + (getHorizontalDataRegions() * 2);
}
-int32_t CBC_SymbolInfo::getSymbolHeight(int32_t& e) {
- return getSymbolDataHeight(e) + (getVerticalDataRegions(e) * 2);
+
+int32_t CBC_SymbolInfo::getSymbolHeight() const {
+ return getSymbolDataHeight() + (getVerticalDataRegions() * 2);
}
-int32_t CBC_SymbolInfo::getCodewordCount() {
+
+int32_t CBC_SymbolInfo::getCodewordCount() const {
return m_dataCapacity + m_errorCodewords;
}
-int32_t CBC_SymbolInfo::getInterleavedBlockCount() {
+
+int32_t CBC_SymbolInfo::getInterleavedBlockCount() const {
return m_dataCapacity / m_rsBlockData;
}
-int32_t CBC_SymbolInfo::getDataLengthForInterleavedBlock(int32_t index) {
+
+int32_t CBC_SymbolInfo::getDataLengthForInterleavedBlock(int32_t index) const {
return m_rsBlockData;
}
-int32_t CBC_SymbolInfo::getErrorLengthForInterleavedBlock(int32_t index) {
+
+int32_t CBC_SymbolInfo::getErrorLengthForInterleavedBlock(int32_t index) const {
return m_rsBlockError;
}