From d19e912dd469e4bdad9f3020e1f6eb98f10f3470 Mon Sep 17 00:00:00 2001 From: tsepez Date: Wed, 2 Nov 2016 15:43:18 -0700 Subject: Remove FX_BOOL from xfa. Review-Url: https://codereview.chromium.org/2467203003 --- xfa/fxbarcode/datamatrix/BC_SymbolInfo.cpp | 74 +++++++++++++++--------------- 1 file changed, 37 insertions(+), 37 deletions(-) (limited to 'xfa/fxbarcode/datamatrix/BC_SymbolInfo.cpp') diff --git a/xfa/fxbarcode/datamatrix/BC_SymbolInfo.cpp b/xfa/fxbarcode/datamatrix/BC_SymbolInfo.cpp index b6323041f9..77a809a511 100644 --- a/xfa/fxbarcode/datamatrix/BC_SymbolInfo.cpp +++ b/xfa/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(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[29] = new CBC_DataMatrixSymbolInfo144(); } @@ -80,7 +80,7 @@ void CBC_SymbolInfo::Finalize() { } } -CBC_SymbolInfo::CBC_SymbolInfo(FX_BOOL rectangular, +CBC_SymbolInfo::CBC_SymbolInfo(bool rectangular, int32_t dataCapacity, int32_t errorCodewords, int32_t matrixWidth, @@ -95,7 +95,7 @@ CBC_SymbolInfo::CBC_SymbolInfo(FX_BOOL rectangular, m_rsBlockData = dataCapacity; m_rsBlockError = errorCodewords; } -CBC_SymbolInfo::CBC_SymbolInfo(FX_BOOL rectangular, +CBC_SymbolInfo::CBC_SymbolInfo(bool rectangular, int32_t dataCapacity, int32_t errorCodewords, int32_t matrixWidth, @@ -115,23 +115,23 @@ CBC_SymbolInfo::CBC_SymbolInfo(FX_BOOL rectangular, CBC_SymbolInfo::~CBC_SymbolInfo() {} CBC_SymbolInfo* CBC_SymbolInfo::lookup(int32_t dataCodewords, int32_t& e) { - return lookup(dataCodewords, FORCE_NONE, TRUE, 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); + return lookup(dataCodewords, shape, true, e); } CBC_SymbolInfo* CBC_SymbolInfo::lookup(int32_t dataCodewords, - FX_BOOL allowRectangular, - FX_BOOL fail, + bool allowRectangular, + bool fail, int32_t& e) { SymbolShapeHint shape = allowRectangular ? FORCE_NONE : FORCE_SQUARE; return lookup(dataCodewords, shape, fail, e); } CBC_SymbolInfo* CBC_SymbolInfo::lookup(int32_t dataCodewords, SymbolShapeHint shape, - FX_BOOL fail, + bool fail, int32_t& e) { return lookup(dataCodewords, shape, nullptr, nullptr, fail, e); } @@ -139,7 +139,7 @@ CBC_SymbolInfo* CBC_SymbolInfo::lookup(int32_t dataCodewords, SymbolShapeHint shape, CBC_Dimension* minSize, CBC_Dimension* maxSize, - FX_BOOL fail, + bool fail, int32_t& e) { for (size_t i = 0; i < kSymbolsCount; i++) { CBC_SymbolInfo* symbol = g_symbols[i]; -- cgit v1.2.3