From 36ac7dd520ff4c5c338a3699e3a147ca51f27958 Mon Sep 17 00:00:00 2001 From: Alexander Stillich Date: Mon, 5 Nov 2018 16:13:36 +0100 Subject: [PATCH] More signed / unsigned warning fixes --- src/zxing/win32/zxing/win_iconv.c | 6 +-- .../zxing/aztec/decoder/AztecDecoder.cpp | 2 +- src/zxing/zxing/common/Array.h | 2 +- src/zxing/zxing/common/GridSampler.cpp | 4 +- .../zxing/common/PerspectiveTransform.cpp | 2 +- src/zxing/zxing/common/Str.cpp | 4 +- .../zxing/datamatrix/DataMatrixVersion.cpp | 2 +- .../decoder/DataMatrixBitMatrixParser.cpp | 2 +- .../decoder/DataMatrixDataBlock.cpp | 2 +- .../datamatrix/decoder/DataMatrixDecoder.cpp | 2 +- .../detector/DataMatrixDetector.cpp | 2 +- .../detector/MultiFinderPatternFinder.cpp | 2 +- src/zxing/zxing/oned/CodaBarReader.cpp | 4 +- src/zxing/zxing/oned/Code128Reader.cpp | 8 ++-- src/zxing/zxing/oned/Code39Reader.cpp | 16 ++++---- src/zxing/zxing/oned/Code93Reader.cpp | 20 +++++----- src/zxing/zxing/oned/EAN13Reader.cpp | 4 +- src/zxing/zxing/oned/EAN8Reader.cpp | 4 +- src/zxing/zxing/oned/ITFReader.cpp | 4 +- .../zxing/oned/MultiFormatOneDReader.cpp | 2 +- .../zxing/oned/MultiFormatUPCEANReader.cpp | 2 +- src/zxing/zxing/oned/OneDReader.cpp | 4 +- src/zxing/zxing/oned/UPCEANReader.cpp | 6 +-- src/zxing/zxing/oned/UPCEReader.cpp | 2 +- .../zxing/pdf417/detector/LinesSampler.cpp | 4 +- src/zxing/zxing/qrcode/QRVersion.cpp | 6 +-- .../qrcode/decoder/QRBitMatrixParser.cpp | 2 +- .../zxing/qrcode/decoder/QRDataBlock.cpp | 2 +- src/zxing/zxing/qrcode/decoder/QRDataMask.cpp | 4 +- .../decoder/QRDecodedBitStreamParser.cpp | 4 +- .../detector/QRAlignmentPatternFinder.cpp | 2 +- .../qrcode/detector/QRFinderPatternFinder.cpp | 38 +++++++++---------- 32 files changed, 85 insertions(+), 85 deletions(-) diff --git a/src/zxing/win32/zxing/win_iconv.c b/src/zxing/win32/zxing/win_iconv.c index 17f6773..49b3675 100644 --- a/src/zxing/win32/zxing/win_iconv.c +++ b/src/zxing/win32/zxing/win_iconv.c @@ -783,7 +783,7 @@ win_iconv(iconv_t _cd, char **inbuf, size_t *inbytesleft, char **outbuf, size_t if (outbuf != NULL && *outbuf != NULL && cd->to.flush != NULL) { tomode = cd->to.mode; - outsize = cd->to.flush(&cd->to, (uchar *)*outbuf, *outbytesleft); + outsize = cd->to.flush(&cd->to, (uchar *)*outbuf, (int)*outbytesleft); if (outsize == -1) { if ((cd->to.flags & FLAG_IGNORE) && errno != E2BIG) @@ -810,7 +810,7 @@ win_iconv(iconv_t _cd, char **inbuf, size_t *inbytesleft, char **outbuf, size_t tomode = cd->to.mode; wsize = MB_CHAR_MAX; - insize = cd->from.mbtowc(&cd->from, (const uchar *)*inbuf, *inbytesleft, wbuf, &wsize); + insize = cd->from.mbtowc(&cd->from, (const uchar *)*inbuf, (int)*inbytesleft, wbuf, &wsize); if (insize == -1) { if (cd->to.flags & FLAG_IGNORE) @@ -861,7 +861,7 @@ win_iconv(iconv_t _cd, char **inbuf, size_t *inbytesleft, char **outbuf, size_t } } - outsize = cd->to.wctomb(&cd->to, wbuf, wsize, (uchar *)*outbuf, *outbytesleft); + outsize = cd->to.wctomb(&cd->to, wbuf, wsize, (uchar *)*outbuf, (int)*outbytesleft); if (outsize == -1) { if ((cd->to.flags & FLAG_IGNORE) && errno != E2BIG) diff --git a/src/zxing/zxing/aztec/decoder/AztecDecoder.cpp b/src/zxing/zxing/aztec/decoder/AztecDecoder.cpp index 441c35e..33388ee 100644 --- a/src/zxing/zxing/aztec/decoder/AztecDecoder.cpp +++ b/src/zxing/zxing/aztec/decoder/AztecDecoder.cpp @@ -441,7 +441,7 @@ Ref Decoder::extractBits(Ref matrix) { } - Ref returnValue(new BitArray(rawbits.size())); + Ref returnValue(new BitArray(int(rawbits.size()))); for (int i = 0; i < (int)rawbits.size(); i++) { if (rawbits[i]) returnValue->set(i); } diff --git a/src/zxing/zxing/common/Array.h b/src/zxing/zxing/common/Array.h index af3a521..83b4232 100644 --- a/src/zxing/zxing/common/Array.h +++ b/src/zxing/zxing/common/Array.h @@ -70,7 +70,7 @@ public: return values_[i]; } int size() const { - return values_.size(); + return int(values_.size()); } bool empty() const { return values_.size() == 0; diff --git a/src/zxing/zxing/common/GridSampler.cpp b/src/zxing/zxing/common/GridSampler.cpp index c1c86ad..4506595 100644 --- a/src/zxing/zxing/common/GridSampler.cpp +++ b/src/zxing/zxing/common/GridSampler.cpp @@ -36,7 +36,7 @@ Ref GridSampler::sampleGrid(Ref image, int dimension, Ref< Ref bits(new BitMatrix(dimension)); vector points(dimension << 1, (const float)0.0f); for (int y = 0; y < dimension; y++) { - int max = points.size(); + int max = int(points.size()); float yValue = (float)y + 0.5f; for (int x = 0; x < max; x += 2) { points[x] = (float)(x >> 1) + 0.5f; @@ -57,7 +57,7 @@ Ref GridSampler::sampleGrid(Ref image, int dimensionX, int Ref bits(new BitMatrix(dimensionX, dimensionY)); vector points(dimensionX << 1, (const float)0.0f); for (int y = 0; y < dimensionY; y++) { - int max = points.size(); + int max = int(points.size()); float yValue = (float)y + 0.5f; for (int x = 0; x < max; x += 2) { points[x] = (float)(x >> 1) + 0.5f; diff --git a/src/zxing/zxing/common/PerspectiveTransform.cpp b/src/zxing/zxing/common/PerspectiveTransform.cpp index 7344efb..8f33e43 100644 --- a/src/zxing/zxing/common/PerspectiveTransform.cpp +++ b/src/zxing/zxing/common/PerspectiveTransform.cpp @@ -87,7 +87,7 @@ Ref PerspectiveTransform::times(Ref } void PerspectiveTransform::transformPoints(vector &points) { - int max = points.size(); + int max = int(points.size()); for (int i = 0; i < max; i += 2) { float x = points[i]; float y = points[i + 1]; diff --git a/src/zxing/zxing/common/Str.cpp b/src/zxing/zxing/common/Str.cpp index 983651a..f48b6cd 100644 --- a/src/zxing/zxing/common/Str.cpp +++ b/src/zxing/zxing/common/Str.cpp @@ -39,9 +39,9 @@ const std::string& String::getText() const { char String::charAt(int i) const { return text_[i]; } -int String::size() const { return text_.size(); } +int String::size() const { return int(text_.size()); } -int String::length() const { return text_.size(); } +int String::length() const { return int(text_.size()); } Ref String::substring(int i) const { return Ref(new String(text_.substr(i))); diff --git a/src/zxing/zxing/datamatrix/DataMatrixVersion.cpp b/src/zxing/zxing/datamatrix/DataMatrixVersion.cpp index f94ca65..a6fd59a 100644 --- a/src/zxing/zxing/datamatrix/DataMatrixVersion.cpp +++ b/src/zxing/zxing/datamatrix/DataMatrixVersion.cpp @@ -193,7 +193,7 @@ int Version::buildVersions() { new ECBlocks(24, new ECB(1, 32))))); VERSIONS.push_back(Ref(new Version(30, 16, 48, 14, 22, new ECBlocks(28, new ECB(1, 49))))); - return VERSIONS.size(); + return int(VERSIONS.size()); } } } diff --git a/src/zxing/zxing/datamatrix/decoder/DataMatrixBitMatrixParser.cpp b/src/zxing/zxing/datamatrix/decoder/DataMatrixBitMatrixParser.cpp index 37b242e..ba48a17 100644 --- a/src/zxing/zxing/datamatrix/decoder/DataMatrixBitMatrixParser.cpp +++ b/src/zxing/zxing/datamatrix/decoder/DataMatrixBitMatrixParser.cpp @@ -27,7 +27,7 @@ namespace zxing { namespace datamatrix { int BitMatrixParser::copyBit(size_t x, size_t y, int versionBits) { - return bitMatrix_->get(x, y) ? (versionBits << 1) | 0x1 : versionBits << 1; + return bitMatrix_->get(int(x), int(y)) ? (versionBits << 1) | 0x1 : versionBits << 1; } BitMatrixParser::BitMatrixParser(Ref bitMatrix) : bitMatrix_(NULL), diff --git a/src/zxing/zxing/datamatrix/decoder/DataMatrixDataBlock.cpp b/src/zxing/zxing/datamatrix/decoder/DataMatrixDataBlock.cpp index 474fd48..26c96de 100644 --- a/src/zxing/zxing/datamatrix/decoder/DataMatrixDataBlock.cpp +++ b/src/zxing/zxing/datamatrix/decoder/DataMatrixDataBlock.cpp @@ -67,7 +67,7 @@ std::vector > DataBlock::getDataBlocks(ArrayRef rawCodeword // All blocks have the same amount of data, except that the last n // (where n may be 0) have 1 more byte. Figure out where these start. int shorterBlocksTotalCodewords = result[0]->codewords_->size(); - int longerBlocksStartAt = result.size() - 1; + int longerBlocksStartAt = int(result.size()) - 1; while (longerBlocksStartAt >= 0) { int numCodewords = result[longerBlocksStartAt]->codewords_->size(); if (numCodewords == shorterBlocksTotalCodewords) { diff --git a/src/zxing/zxing/datamatrix/decoder/DataMatrixDecoder.cpp b/src/zxing/zxing/datamatrix/decoder/DataMatrixDecoder.cpp index 31efb0f..3bd1411 100644 --- a/src/zxing/zxing/datamatrix/decoder/DataMatrixDecoder.cpp +++ b/src/zxing/zxing/datamatrix/decoder/DataMatrixDecoder.cpp @@ -72,7 +72,7 @@ Ref Decoder::decode(Ref bits) { // Separate into data blocks std::vector > dataBlocks = DataBlock::getDataBlocks(codewords, version); - int dataBlocksCount = dataBlocks.size(); + int dataBlocksCount = int(dataBlocks.size()); // Count total number of data bytes int totalBytes = 0; diff --git a/src/zxing/zxing/datamatrix/detector/DataMatrixDetector.cpp b/src/zxing/zxing/datamatrix/detector/DataMatrixDetector.cpp index 9fc02af..4ae2a30 100644 --- a/src/zxing/zxing/datamatrix/detector/DataMatrixDetector.cpp +++ b/src/zxing/zxing/datamatrix/detector/DataMatrixDetector.cpp @@ -425,7 +425,7 @@ Ref Detector::sampleGrid(Ref image, int dimensionX, int di } void Detector::insertionSort(std::vector > &vector) { - int max = vector.size(); + int max = int(vector.size()); bool swapped = true; Ref value; Ref valueB; diff --git a/src/zxing/zxing/multi/qrcode/detector/MultiFinderPatternFinder.cpp b/src/zxing/zxing/multi/qrcode/detector/MultiFinderPatternFinder.cpp index edc825f..38cd03d 100644 --- a/src/zxing/zxing/multi/qrcode/detector/MultiFinderPatternFinder.cpp +++ b/src/zxing/zxing/multi/qrcode/detector/MultiFinderPatternFinder.cpp @@ -138,7 +138,7 @@ vector > MultiFinderPatternFinder::findMulti(DecodeHints vector > > MultiFinderPatternFinder::selectBestPatterns(){ vector > possibleCenters = possibleCenters_; - int size = possibleCenters.size(); + int size = int(possibleCenters.size()); if (size < 3) { // Couldn't find enough finder patterns diff --git a/src/zxing/zxing/oned/CodaBarReader.cpp b/src/zxing/zxing/oned/CodaBarReader.cpp index 3db0a47..f00ef81 100644 --- a/src/zxing/zxing/oned/CodaBarReader.cpp +++ b/src/zxing/zxing/oned/CodaBarReader.cpp @@ -79,7 +79,7 @@ CodaBarReader::CodaBarReader() Ref CodaBarReader::decodeRow(int rowNumber, Ref row, zxing::DecodeHints /*hints*/) { { // Arrays.fill(counters, 0); - int size = counters.size(); + int size = int(counters.size()); counters.resize(0); counters.resize(size); } @@ -170,7 +170,7 @@ void CodaBarReader::validatePattern(int start) { // First, sum up the total size of our four categories of stripe sizes; vector sizes (4, 0); vector counts (4, 0); - int end = decodeRowResult.length() - 1; + int end = int(decodeRowResult.length()) - 1; // We break out of this loop in the middle, in order to handle // inter-character spaces properly. diff --git a/src/zxing/zxing/oned/Code128Reader.cpp b/src/zxing/zxing/oned/Code128Reader.cpp index 56ec39b..b5c952a 100644 --- a/src/zxing/zxing/oned/Code128Reader.cpp +++ b/src/zxing/zxing/oned/Code128Reader.cpp @@ -187,7 +187,7 @@ vector Code128Reader::findStartPattern(Ref row){ vector counters (6, 0); int patternStart = rowOffset; bool isWhite = false; - int patternLength = counters.size(); + int patternLength = int(counters.size()); for (int i = rowOffset; i < width; i++) { if (row->get(i) ^ isWhite) { @@ -312,7 +312,7 @@ Ref Code128Reader::decodeRow(int rowNumber, Ref row, zxing::De // Advance to where the next code will to start lastStart = nextStart; - for (int i = 0, e = counters.size(); i < e; i++) { + for (int i = 0, e = int(counters.size()); i < e; i++) { nextStart += counters[i]; } @@ -512,7 +512,7 @@ Ref Code128Reader::decodeRow(int rowNumber, Ref row, zxing::De } // Need to pull out the check digits from string - int resultLength = result.length(); + int resultLength = int(result.length()); if (resultLength == 0) { // false positive throw NotFoundException(); @@ -531,7 +531,7 @@ Ref Code128Reader::decodeRow(int rowNumber, Ref row, zxing::De float left = (float) (startPatternInfo[1] + startPatternInfo[0]) / 2.0f; float right = lastStart + lastPatternSize / 2.0f; - int rawCodesSize = rawCodes.size(); + int rawCodesSize = int(rawCodes.size()); ArrayRef rawBytes (rawCodesSize); for (int i = 0; i < rawCodesSize; i++) { rawBytes[i] = rawCodes[i]; diff --git a/src/zxing/zxing/oned/Code39Reader.cpp b/src/zxing/zxing/oned/Code39Reader.cpp index 04583de..91bb8c9 100644 --- a/src/zxing/zxing/oned/Code39Reader.cpp +++ b/src/zxing/zxing/oned/Code39Reader.cpp @@ -95,7 +95,7 @@ Code39Reader::Code39Reader(bool usingCheckDigit_, bool extendedMode_) { Ref Code39Reader::decodeRow(int rowNumber, Ref row, zxing::DecodeHints /*hints*/) { std::vector& theCounters (counters); { // Arrays.fill(counters, 0); - int size = theCounters.size(); + int size = int(theCounters.size()); theCounters.resize(0); theCounters.resize(size); } std::string& result (decodeRowResult); @@ -117,7 +117,7 @@ Ref Code39Reader::decodeRow(int rowNumber, Ref row, zxing::Dec decodedChar = patternToChar(pattern); result.append(1, decodedChar); lastStart = nextStart; - for (int i = 0, end=theCounters.size(); i < end; i++) { + for (int i = 0, end=int(theCounters.size()); i < end; i++) { nextStart += theCounters[i]; } // Read off white space @@ -127,7 +127,7 @@ Ref Code39Reader::decodeRow(int rowNumber, Ref row, zxing::Dec // Look for whitespace after pattern: int lastPatternSize = 0; - for (int i = 0, e = theCounters.size(); i < e; i++) { + for (int i = 0, e = int(theCounters.size()); i < e; i++) { lastPatternSize += theCounters[i]; } int whiteSpaceAfterEnd = nextStart - lastStart - lastPatternSize; @@ -138,10 +138,10 @@ Ref Code39Reader::decodeRow(int rowNumber, Ref row, zxing::Dec } if (usingCheckDigit) { - int max = result.length() - 1; + int max = int(result.length()) - 1; int total = 0; for (int i = 0; i < max; i++) { - total += alphabet_string.find_first_of(decodeRowResult[i], 0); + total += int(alphabet_string.find_first_of(decodeRowResult[i], 0)); } if (result[max] != ALPHABET[total % 43]) { throw ChecksumException(); @@ -182,7 +182,7 @@ vector Code39Reader::findAsteriskPattern(Ref row, vector& co int counterPosition = 0; int patternStart = rowOffset; bool isWhite = false; - int patternLength = counters.size(); + int patternLength = int(counters.size()); for (int i = rowOffset; i < width; i++) { if (row->get(i) ^ isWhite) { @@ -218,7 +218,7 @@ vector Code39Reader::findAsteriskPattern(Ref row, vector& co // For efficiency, returns -1 on failure. Not throwing here saved as many as // 700 exceptions per image when using some of our blackbox images. int Code39Reader::toNarrowWidePattern(vector& counters){ - int numCounters = counters.size(); + int numCounters = int(counters.size()); int maxNarrowCounter = 0; int wideCounters; do { @@ -272,7 +272,7 @@ char Code39Reader::patternToChar(int pattern){ } Ref Code39Reader::decodeExtended(std::string encoded){ - int length = encoded.length(); + int length = int(encoded.length()); std::string tmpDecoded; for (int i = 0; i < length; i++) { char c = encoded[i]; diff --git a/src/zxing/zxing/oned/Code93Reader.cpp b/src/zxing/zxing/oned/Code93Reader.cpp index f01dba2..5cddd1b 100644 --- a/src/zxing/zxing/oned/Code93Reader.cpp +++ b/src/zxing/zxing/oned/Code93Reader.cpp @@ -72,7 +72,7 @@ Ref Code93Reader::decodeRow(int rowNumber, Ref row, zxing::Dec vector& theCounters (counters); { // Arrays.fill(counters, 0); - int size = theCounters.size(); + int size = int(theCounters.size()); theCounters.resize(0); theCounters.resize(size); } string& result (decodeRowResult); @@ -89,7 +89,7 @@ Ref Code93Reader::decodeRow(int rowNumber, Ref row, zxing::Dec decodedChar = patternToChar(pattern); result.append(1, decodedChar); lastStart = nextStart; - for(int i=0, e=theCounters.size(); i < e; ++i) { + for(int i=0, e=int(theCounters.size()); i < e; ++i) { nextStart += theCounters[i]; } // Read off white space @@ -99,7 +99,7 @@ Ref Code93Reader::decodeRow(int rowNumber, Ref row, zxing::Dec // Look for whitespace after pattern: int lastPatternSize = 0; - for (int i = 0, e = theCounters.size(); i < e; i++) { + for (int i = 0, e = int(theCounters.size()); i < e; i++) { lastPatternSize += theCounters[i]; } @@ -140,14 +140,14 @@ Code93Reader::Range Code93Reader::findAsteriskPattern(Ref row) { int rowOffset = row->getNextSet(0); { // Arrays.fill(counters, 0); - int size = counters.size(); + int size = int(counters.size()); counters.resize(0); counters.resize(size); } vector& theCounters (counters); int patternStart = rowOffset; bool isWhite = false; - int patternLength = theCounters.size(); + int patternLength = int(theCounters.size()); int counterPosition = 0; for (int i = rowOffset; i < width; i++) { @@ -176,9 +176,9 @@ Code93Reader::Range Code93Reader::findAsteriskPattern(Ref row) { } int Code93Reader::toPattern(vector& counters) { - int max = counters.size(); + int max = int(counters.size()); int sum = 0; - for(int i=0, e=counters.size(); i Code93Reader::decodeExtended(string const& encoded) { - int length = encoded.length(); + int length = int(encoded.length()); string decoded; for (int i = 0; i < length; i++) { char c = encoded[i]; @@ -271,7 +271,7 @@ Ref Code93Reader::decodeExtended(string const& encoded) { } void Code93Reader::checkChecksums(string const& result) { - int length = result.length(); + int length = int(result.length()); checkOneChecksum(result, length - 2, 20); checkOneChecksum(result, length - 1, 15); } @@ -282,7 +282,7 @@ void Code93Reader::checkOneChecksum(string const& result, int weight = 1; int total = 0; for (int i = checkPosition - 1; i >= 0; i--) { - total += weight * ALPHABET_STRING.find_first_of(result[i]); + total += weight * int(ALPHABET_STRING.find_first_of(result[i])); if (++weight > weightMax) { weight = 1; } diff --git a/src/zxing/zxing/oned/EAN13Reader.cpp b/src/zxing/zxing/oned/EAN13Reader.cpp index 86b823e..e044a1c 100644 --- a/src/zxing/zxing/oned/EAN13Reader.cpp +++ b/src/zxing/zxing/oned/EAN13Reader.cpp @@ -45,7 +45,7 @@ int EAN13Reader::decodeMiddle(Ref row, for (int x = 0; x < 6 && rowOffset < end; x++) { int bestMatch = decodeDigit(row, counters, rowOffset, L_AND_G_PATTERNS); resultString.append(1, (byte) ('0' + bestMatch % 10)); - for (int i = 0, end = counters.size(); i = 10) { @@ -62,7 +62,7 @@ int EAN13Reader::decodeMiddle(Ref row, int bestMatch = decodeDigit(row, counters, rowOffset, L_PATTERNS); resultString.append(1, (byte) ('0' + bestMatch)); - for (int i = 0, end = counters.size(); i < end; i++) { + for (int i = 0, end = int(counters.size()); i < end; i++) { rowOffset += counters[i]; } } diff --git a/src/zxing/zxing/oned/EAN8Reader.cpp b/src/zxing/zxing/oned/EAN8Reader.cpp index a7da8c7..cf89942 100644 --- a/src/zxing/zxing/oned/EAN8Reader.cpp +++ b/src/zxing/zxing/oned/EAN8Reader.cpp @@ -42,7 +42,7 @@ int EAN8Reader::decodeMiddle(Ref row, for (int x = 0; x < 4 && rowOffset < end; x++) { int bestMatch = decodeDigit(row, counters, rowOffset, L_PATTERNS); result.append(1, (byte) ('0' + bestMatch)); - for (int i = 0, end = counters.size(); i < end; i++) { + for (int i = 0, end = int(counters.size()); i < end; i++) { rowOffset += counters[i]; } } @@ -53,7 +53,7 @@ int EAN8Reader::decodeMiddle(Ref row, for (int x = 0; x < 4 && rowOffset < end; x++) { int bestMatch = decodeDigit(row, counters, rowOffset, L_PATTERNS); result.append(1, (byte) ('0' + bestMatch)); - for (int i = 0, end = counters.size(); i < end; i++) { + for (int i = 0, end = int(counters.size()); i < end; i++) { rowOffset += counters[i]; } } diff --git a/src/zxing/zxing/oned/ITFReader.cpp b/src/zxing/zxing/oned/ITFReader.cpp index 4fc1331..7f5b01d 100644 --- a/src/zxing/zxing/oned/ITFReader.cpp +++ b/src/zxing/zxing/oned/ITFReader.cpp @@ -155,7 +155,7 @@ void ITFReader::decodeMiddle(Ref row, bestMatch = decodeDigit(counterWhite); resultString.append(1, (byte) ('0' + bestMatch)); - for (int i = 0, e = counterDigitPair.size(); i < e; i++) { + for (int i = 0, e = int(counterDigitPair.size()); i < e; i++) { payloadStart += counterDigitPair[i]; } } @@ -274,7 +274,7 @@ ITFReader::Range ITFReader::findGuardPattern(Ref row, vector const& pattern) { // TODO: This is very similar to implementation in UPCEANReader. Consider if they can be // merged to a single method. - int patternLength = pattern.size(); + int patternLength = int(pattern.size()); vector counters(patternLength); int width = row->getSize(); bool isWhite = false; diff --git a/src/zxing/zxing/oned/MultiFormatOneDReader.cpp b/src/zxing/zxing/oned/MultiFormatOneDReader.cpp index 3bfe5d0..7b18345 100644 --- a/src/zxing/zxing/oned/MultiFormatOneDReader.cpp +++ b/src/zxing/zxing/oned/MultiFormatOneDReader.cpp @@ -81,7 +81,7 @@ MultiFormatOneDReader::MultiFormatOneDReader(DecodeHints hints) : readers() { #include Ref MultiFormatOneDReader::decodeRow(int rowNumber, Ref row, zxing::DecodeHints hints) { - int size = readers.size(); + int size = int(readers.size()); for (int i = 0; i < size; i++) { OneDReader* reader = readers[i]; try { diff --git a/src/zxing/zxing/oned/MultiFormatUPCEANReader.cpp b/src/zxing/zxing/oned/MultiFormatUPCEANReader.cpp index dbc67b2..0ee3398 100644 --- a/src/zxing/zxing/oned/MultiFormatUPCEANReader.cpp +++ b/src/zxing/zxing/oned/MultiFormatUPCEANReader.cpp @@ -64,7 +64,7 @@ MultiFormatUPCEANReader::MultiFormatUPCEANReader(DecodeHints hints) : readers() Ref MultiFormatUPCEANReader::decodeRow(int rowNumber, Ref row, zxing::DecodeHints /*hints*/) { // Compute this location once and reuse it on multiple implementations UPCEANReader::Range startGuardPattern = UPCEANReader::findStartGuardPattern(row); - for (int i = 0, e = readers.size(); i < e; i++) { + for (int i = 0, e = int(readers.size()); i < e; i++) { Ref reader = readers[i]; Ref result; try { diff --git a/src/zxing/zxing/oned/OneDReader.cpp b/src/zxing/zxing/oned/OneDReader.cpp index 4cf73b5..e48600c 100644 --- a/src/zxing/zxing/oned/OneDReader.cpp +++ b/src/zxing/zxing/oned/OneDReader.cpp @@ -155,7 +155,7 @@ int OneDReader::patternMatchVariance(vector& counters, int OneDReader::patternMatchVariance(vector& counters, int const pattern[], int maxIndividualVariance) { - int numCounters = counters.size(); + int numCounters = int(counters.size()); unsigned int total = 0; unsigned int patternLength = 0; for (int i = 0; i < numCounters; i++) { @@ -189,7 +189,7 @@ int OneDReader::patternMatchVariance(vector& counters, void OneDReader::recordPattern(Ref row, int start, vector& counters) { - int numCounters = counters.size(); + int numCounters = int(counters.size()); for (int i = 0; i < numCounters; i++) { counters[i] = 0; } diff --git a/src/zxing/zxing/oned/UPCEANReader.cpp b/src/zxing/zxing/oned/UPCEANReader.cpp index 4812ca1..28dd1ad 100644 --- a/src/zxing/zxing/oned/UPCEANReader.cpp +++ b/src/zxing/zxing/oned/UPCEANReader.cpp @@ -206,7 +206,7 @@ UPCEANReader::Range UPCEANReader::findGuardPattern(Ref row, } std::cerr << std::endl; } - int patternLength = pattern.size(); + int patternLength = int(pattern.size()); int width = row->getSize(); bool isWhite = whiteFirst; rowOffset = whiteFirst ? row->getNextUnset(rowOffset) : row->getNextSet(rowOffset); @@ -249,7 +249,7 @@ int UPCEANReader::decodeDigit(Ref row, recordPattern(row, rowOffset, counters); int bestVariance = MAX_AVG_VARIANCE; // worst variance we'll accept int bestMatch = -1; - int max = patterns.size(); + int max = int(patterns.size()); for (int i = 0; i < max; i++) { int const* pattern (patterns[i]); int variance = patternMatchVariance(counters, pattern, MAX_INDIVIDUAL_VARIANCE); @@ -281,7 +281,7 @@ bool UPCEANReader::checkChecksum(Ref const& s) { */ bool UPCEANReader::checkStandardUPCEANChecksum(Ref const& s_) { std::string const& s (s_->getText()); - int length = s.length(); + int length = int(s.length()); if (length == 0) { return false; } diff --git a/src/zxing/zxing/oned/UPCEReader.cpp b/src/zxing/zxing/oned/UPCEReader.cpp index faff7c2..f1d4a41 100644 --- a/src/zxing/zxing/oned/UPCEReader.cpp +++ b/src/zxing/zxing/oned/UPCEReader.cpp @@ -65,7 +65,7 @@ int UPCEReader::decodeMiddle(Ref row, Range const& startRange, string& for (int x = 0; x < 6 && rowOffset < end; x++) { int bestMatch = decodeDigit(row, counters, rowOffset, L_AND_G_PATTERNS); result.append(1, (byte) ('0' + bestMatch % 10)); - for (int i = 0, e = counters.size(); i < e; i++) { + for (int i = 0, e = int(counters.size()); i < e; i++) { rowOffset += counters[i]; } if (bestMatch >= 10) { diff --git a/src/zxing/zxing/pdf417/detector/LinesSampler.cpp b/src/zxing/zxing/pdf417/detector/LinesSampler.cpp index c3e5f38..1ada0f6 100644 --- a/src/zxing/zxing/pdf417/detector/LinesSampler.cpp +++ b/src/zxing/zxing/pdf417/detector/LinesSampler.cpp @@ -190,7 +190,7 @@ Ref LinesSampler::sample() { detectedCodeWords.resize(rowCount); // XXX - Ref grid(new BitMatrix(dimension_, detectedCodeWords.size())); + Ref grid(new BitMatrix(dimension_, int(detectedCodeWords.size()))); codewordsToBitMatrix(detectedCodeWords, grid); return grid; @@ -712,7 +712,7 @@ int LinesSampler::decodeRowCount(const int symbolsPerLine, vector > detectedCodeWords.insert(detectedCodeWords.begin() + insertLinesAt[i] + i, vector(symbolsPerLine, 0)); } - int rowCount = getValueWithMaxVotes(rowCountVotes,detectedCodeWords.size()).getVote(); + int rowCount = getValueWithMaxVotes(rowCountVotes, int(detectedCodeWords.size())).getVote(); // int ecLevel = getValueWithMaxVotes(ecLevelVotes); #if PDF417_DIAG && OUTPUT_EC_LEVEL diff --git a/src/zxing/zxing/qrcode/QRVersion.cpp b/src/zxing/zxing/qrcode/QRVersion.cpp index 9b59dc3..8fc48e6 100644 --- a/src/zxing/zxing/qrcode/QRVersion.cpp +++ b/src/zxing/zxing/qrcode/QRVersion.cpp @@ -59,7 +59,7 @@ int ECBlocks::getECCodewordsPerBloc() int ECBlocks::getTotalECCodewords() { - return ecCodewordsPerBloc_ * ecBlocks_.size(); + return ecCodewordsPerBloc_ * int(ecBlocks_.size()); } std::vector& ECBlocks::getECBlocks() { @@ -166,7 +166,7 @@ Ref Version::decodeVersionInformation(unsigned int versionBits) { // We can tolerate up to 3 bits of error since no two version info codewords will // differ in less than 4 bits. if (bestDifference <= 3) { - return getVersionForNumber(bestVersion); + return getVersionForNumber(int(bestVersion)); } // If we didn't find a close enough match, fail return Ref(NULL); @@ -559,7 +559,7 @@ int Version::buildVersions() { new ECB(34, 25)), new ECBlocks(30, new ECB(20, 15), new ECB(61, 16))))); - return VERSIONS.size(); + return int(VERSIONS.size()); } } diff --git a/src/zxing/zxing/qrcode/decoder/QRBitMatrixParser.cpp b/src/zxing/zxing/qrcode/decoder/QRBitMatrixParser.cpp index a348b94..f3d2888 100644 --- a/src/zxing/zxing/qrcode/decoder/QRBitMatrixParser.cpp +++ b/src/zxing/zxing/qrcode/decoder/QRBitMatrixParser.cpp @@ -26,7 +26,7 @@ namespace zxing { namespace qrcode { int BitMatrixParser::copyBit(size_t x, size_t y, int versionBits) { - return bitMatrix_->get(x, y) ? (versionBits << 1) | 0x1 : versionBits << 1; + return bitMatrix_->get(int(x), int(y)) ? (versionBits << 1) | 0x1 : versionBits << 1; } BitMatrixParser::BitMatrixParser(Ref bitMatrix) : diff --git a/src/zxing/zxing/qrcode/decoder/QRDataBlock.cpp b/src/zxing/zxing/qrcode/decoder/QRDataBlock.cpp index 56c5c09..e06e547 100644 --- a/src/zxing/zxing/qrcode/decoder/QRDataBlock.cpp +++ b/src/zxing/zxing/qrcode/decoder/QRDataBlock.cpp @@ -72,7 +72,7 @@ std::vector > DataBlock::getDataBlocks(ArrayRef rawCodeword // All blocks have the same amount of data, except that the last n // (where n may be 0) have 1 more byte. Figure out where these start. int shorterBlocksTotalCodewords = result[0]->codewords_->size(); - int longerBlocksStartAt = result.size() - 1; + int longerBlocksStartAt = int(result.size()) - 1; while (longerBlocksStartAt >= 0) { int numCodewords = result[longerBlocksStartAt]->codewords_->size(); if (numCodewords == shorterBlocksTotalCodewords) { diff --git a/src/zxing/zxing/qrcode/decoder/QRDataMask.cpp b/src/zxing/zxing/qrcode/decoder/QRDataMask.cpp index b231a17..e61d2ac 100644 --- a/src/zxing/zxing/qrcode/decoder/QRDataMask.cpp +++ b/src/zxing/zxing/qrcode/decoder/QRDataMask.cpp @@ -48,7 +48,7 @@ void DataMask::unmaskBitMatrix(BitMatrix& bits, size_t dimension) { for (size_t x = 0; x < dimension; x++) { // TODO: check why the coordinates have to be swapped if (isMasked(y, x)) { - bits.flip(x, y); + bits.flip(int(x), int(y)); } } } @@ -152,7 +152,7 @@ int DataMask::buildDataMasks() { DATA_MASKS.push_back(Ref (new DataMask101())); DATA_MASKS.push_back(Ref (new DataMask110())); DATA_MASKS.push_back(Ref (new DataMask111())); - return DATA_MASKS.size(); + return int(DATA_MASKS.size()); } } diff --git a/src/zxing/zxing/qrcode/decoder/QRDecodedBitStreamParser.cpp b/src/zxing/zxing/qrcode/decoder/QRDecodedBitStreamParser.cpp index 327f8e9..12cc611 100644 --- a/src/zxing/zxing/qrcode/decoder/QRDecodedBitStreamParser.cpp +++ b/src/zxing/zxing/qrcode/decoder/QRDecodedBitStreamParser.cpp @@ -75,7 +75,7 @@ void DecodedBitStreamParser::append(std::string &result, return; } - const int maxOut = 4 * nIn + 1; + const int maxOut = 4 * int(nIn) + 1; char* bufOut = new char[maxOut]; ICONV_CONST char *fromPtr = (ICONV_CONST char *)bufIn; @@ -97,7 +97,7 @@ void DecodedBitStreamParser::append(std::string &result, } iconv_close(cd); - int nResult = maxOut - nTo; + int nResult = maxOut - int(nTo); bufOut[nResult] = '\0'; result.append((const char *)bufOut); delete[] bufOut; diff --git a/src/zxing/zxing/qrcode/detector/QRAlignmentPatternFinder.cpp b/src/zxing/zxing/qrcode/detector/QRAlignmentPatternFinder.cpp index 5f46671..081a176 100644 --- a/src/zxing/zxing/qrcode/detector/QRAlignmentPatternFinder.cpp +++ b/src/zxing/zxing/qrcode/detector/QRAlignmentPatternFinder.cpp @@ -102,7 +102,7 @@ Ref AlignmentPatternFinder::handlePossibleCenter(vector & float centerI = crossCheckVertical(i, (int)centerJ, 2 * stateCount[1], stateCountTotal); if (!isnan_z(centerI)) { float estimatedModuleSize = (float)(stateCount[0] + stateCount[1] + stateCount[2]) / 3.0f; - int max = possibleCenters_->size(); + int max = int(possibleCenters_->size()); for (int index = 0; index < max; index++) { Ref center((*possibleCenters_)[index]); // Look for about the same center and module size: diff --git a/src/zxing/zxing/qrcode/detector/QRFinderPatternFinder.cpp b/src/zxing/zxing/qrcode/detector/QRFinderPatternFinder.cpp index 3800fbf..b714dab 100644 --- a/src/zxing/zxing/qrcode/detector/QRFinderPatternFinder.cpp +++ b/src/zxing/zxing/qrcode/detector/QRFinderPatternFinder.cpp @@ -125,15 +125,15 @@ float FinderPatternFinder::crossCheckVertical(size_t startI, size_t centerJ, int int *stateCount = getCrossCheckStateCount(); // Start counting up from center - int i = startI; - while (i >= 0 && image_->get(centerJ, i)) { + int i = int(startI); + while (i >= 0 && image_->get(int(centerJ), i)) { stateCount[2]++; i--; } if (i < 0) { return nan(); } - while (i >= 0 && !image_->get(centerJ, i) && stateCount[1] <= maxCount) { + while (i >= 0 && !image_->get(int(centerJ), i) && stateCount[1] <= maxCount) { stateCount[1]++; i--; } @@ -141,7 +141,7 @@ float FinderPatternFinder::crossCheckVertical(size_t startI, size_t centerJ, int if (i < 0 || stateCount[1] > maxCount) { return nan(); } - while (i >= 0 && image_->get(centerJ, i) && stateCount[0] <= maxCount) { + while (i >= 0 && image_->get(int(centerJ), i) && stateCount[0] <= maxCount) { stateCount[0]++; i--; } @@ -150,22 +150,22 @@ float FinderPatternFinder::crossCheckVertical(size_t startI, size_t centerJ, int } // Now also count down from center - i = startI + 1; - while (i < maxI && image_->get(centerJ, i)) { + i = int(startI) + 1; + while (i < maxI && image_->get(int(centerJ), i)) { stateCount[2]++; i++; } if (i == maxI) { return nan(); } - while (i < maxI && !image_->get(centerJ, i) && stateCount[3] < maxCount) { + while (i < maxI && !image_->get(int(centerJ), i) && stateCount[3] < maxCount) { stateCount[3]++; i++; } if (i == maxI || stateCount[3] >= maxCount) { return nan(); } - while (i < maxI && image_->get(centerJ, i) && stateCount[4] < maxCount) { + while (i < maxI && image_->get(int(centerJ), i) && stateCount[4] < maxCount) { stateCount[4]++; i++; } @@ -189,22 +189,22 @@ float FinderPatternFinder::crossCheckHorizontal(size_t startJ, size_t centerI, i int maxJ = image_->getWidth(); int *stateCount = getCrossCheckStateCount(); - int j = startJ; - while (j >= 0 && image_->get(j, centerI)) { + int j = int(startJ); + while (j >= 0 && image_->get(j, int(centerI))) { stateCount[2]++; j--; } if (j < 0) { return nan(); } - while (j >= 0 && !image_->get(j, centerI) && stateCount[1] <= maxCount) { + while (j >= 0 && !image_->get(j, int(centerI)) && stateCount[1] <= maxCount) { stateCount[1]++; j--; } if (j < 0 || stateCount[1] > maxCount) { return nan(); } - while (j >= 0 && image_->get(j, centerI) && stateCount[0] <= maxCount) { + while (j >= 0 && image_->get(j, int(centerI)) && stateCount[0] <= maxCount) { stateCount[0]++; j--; } @@ -212,22 +212,22 @@ float FinderPatternFinder::crossCheckHorizontal(size_t startJ, size_t centerI, i return nan(); } - j = startJ + 1; - while (j < maxJ && image_->get(j, centerI)) { + j = int(startJ) + 1; + while (j < maxJ && image_->get(j, int(centerI))) { stateCount[2]++; j++; } if (j == maxJ) { return nan(); } - while (j < maxJ && !image_->get(j, centerI) && stateCount[3] < maxCount) { + while (j < maxJ && !image_->get(j, int(centerI)) && stateCount[3] < maxCount) { stateCount[3]++; j++; } if (j == maxJ || stateCount[3] >= maxCount) { return nan(); } - while (j < maxJ && image_->get(j, centerI) && stateCount[4] < maxCount) { + while (j < maxJ && image_->get(j, int(centerI)) && stateCount[4] < maxCount) { stateCount[4]++; j++; } @@ -247,7 +247,7 @@ float FinderPatternFinder::crossCheckHorizontal(size_t startJ, size_t centerI, i bool FinderPatternFinder::handlePossibleCenter(int* stateCount, size_t i, size_t j) { int stateCountTotal = stateCount[0] + stateCount[1] + stateCount[2] + stateCount[3] + stateCount[4]; - float centerJ = centerFromEnd(stateCount, j); + float centerJ = centerFromEnd(stateCount, int(j)); float centerI = crossCheckVertical(i, (size_t)centerJ, stateCount[2], stateCountTotal); if (!isnan_z(centerI)) { // Re-cross check @@ -459,7 +459,7 @@ Ref FinderPatternFinder::find(DecodeHints const& hints) { // modules in size. This gives the smallest number of pixels the center // could be, so skip this often. When trying harder, look for all // QR versions regardless of how dense they are. - int iSkip = (3 * maxI) / (4 * MAX_MODULES); + int iSkip = (3 * int(maxI)) / (4 * MAX_MODULES); if (iSkip < MIN_SKIP || tryHarder) { iSkip = MIN_SKIP; } @@ -473,7 +473,7 @@ Ref FinderPatternFinder::find(DecodeHints const& hints) { memset(stateCount, 0, sizeof(stateCount)); int currentState = 0; for (size_t j = 0; j < maxJ; j++) { - if (matrix.get(j, i)) { + if (matrix.get(int(j), int(i))) { // Black pixel if ((currentState & 1) == 1) { // Counting white pixels currentState++;