diff options
author | Miklos Vajna <vmiklos@collabora.com> | 2019-01-30 09:05:58 +0100 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.com> | 2019-01-30 09:05:58 +0100 |
commit | a9b1fb2d0c04461f9f21ae2b702fb8694f98274d (patch) | |
tree | 85dd982938325cc8477590ebb8e9c972a9fb7666 | |
parent | 3988aba06f5297fc2262462d89cb601aeffcae3b (diff) |
Fix too small loop variables
These loop variables had narrower type than the iteration's upper bound.
Change-Id: I8e3f2337c97a01743883070ce053dcdd139c9bb9
-rw-r--r-- | src/lib/Dash.cpp | 2 | ||||
-rw-r--r-- | src/lib/MSPUBCollector.cpp | 12 | ||||
-rw-r--r-- | src/lib/MSPUBParser.cpp | 2 | ||||
-rw-r--r-- | src/lib/MSPUBParser2k.cpp | 2 | ||||
-rw-r--r-- | src/lib/MSPUBParser97.cpp | 6 | ||||
-rw-r--r-- | src/lib/PolygonUtils.cpp | 2 |
6 files changed, 13 insertions, 13 deletions
diff --git a/src/lib/Dash.cpp b/src/lib/Dash.cpp index 1ca3a17..00c7ba7 100644 --- a/src/lib/Dash.cpp +++ b/src/lib/Dash.cpp @@ -32,7 +32,7 @@ bool operator==(const Dash &lhs, const Dash &rhs) { return false; } - for (unsigned i = 0; i < lhs.m_dots.size(); ++i) + for (size_t i = 0; i < lhs.m_dots.size(); ++i) { if (lhs.m_dots[i] != rhs.m_dots[i]) { diff --git a/src/lib/MSPUBCollector.cpp b/src/lib/MSPUBCollector.cpp index 94266c2..73c7264 100644 --- a/src/lib/MSPUBCollector.cpp +++ b/src/lib/MSPUBCollector.cpp @@ -1067,15 +1067,15 @@ std::function<void(void)> MSPUBCollector::paintShape(const ShapeInfo &info, cons default: break; } - for (unsigned i = 0; i < dash.m_dots.size(); ++i) + for (size_t i = 0; i < dash.m_dots.size(); ++i) { librevenge::RVNGString dots; - dots.sprintf("draw:dots%d", i + 1); + dots.sprintf("draw:dots%ld", i + 1); graphicsProps.insert(dots.cstr(), static_cast<int>(dash.m_dots[i].m_count)); if (bool(dash.m_dots[i].m_length)) { librevenge::RVNGString length; - length.sprintf("draw:dots%d-length", i + 1); + length.sprintf("draw:dots%ld-length", i + 1); graphicsProps.insert(length.cstr(), dash.m_dots[i].m_length.get(), librevenge::RVNG_INCH); } } @@ -1165,7 +1165,7 @@ std::function<void(void)> MSPUBCollector::paintShape(const ShapeInfo &info, cons librevenge::RVNGPropertyList paraProps = getParaStyleProps(text[para].style, text[para].style.m_defaultCharStyleIndex); m_painter->openParagraph(paraProps); - for (unsigned i_spans = 0; i_spans < paraTexts[para].size(); ++i_spans) + for (size_t i_spans = 0; i_spans < paraTexts[para].size(); ++i_spans) { librevenge::RVNGPropertyList charProps = getCharStyleProps(text[para].spans[i_spans].style, text[para].style.m_defaultCharStyleIndex); m_painter->openSpan(charProps); @@ -1226,7 +1226,7 @@ std::function<void(void)> MSPUBCollector::paintShape(const ShapeInfo &info, cons { librevenge::RVNGPropertyList paraProps = getParaStyleProps(line.style, line.style.m_defaultCharStyleIndex); m_painter->openParagraph(paraProps); - for (unsigned i_spans = 0; i_spans < line.spans.size(); ++i_spans) + for (size_t i_spans = 0; i_spans < line.spans.size(); ++i_spans) { librevenge::RVNGString textString; appendCharacters(textString, line.spans[i_spans].chars, @@ -1893,7 +1893,7 @@ void MSPUBCollector::ponderStringEncoding( { for (const auto &i : str) { - for (unsigned j = 0; j < i.spans.size(); ++j) + for (size_t j = 0; j < i.spans.size(); ++j) { const std::vector<unsigned char> &chars = i.spans[j].chars; m_allText.insert(m_allText.end(), chars.begin(), chars.end()); diff --git a/src/lib/MSPUBParser.cpp b/src/lib/MSPUBParser.cpp index b13bb47..c8cc666 100644 --- a/src/lib/MSPUBParser.cpp +++ b/src/lib/MSPUBParser.cpp @@ -776,7 +776,7 @@ bool MSPUBParser::parseShape(librevenge::RVNGInputStream *input, return false; } boost::optional<unsigned> index; - for (unsigned i = 0; i < m_cellsChunkIndices.size(); ++i) + for (size_t i = 0; i < m_cellsChunkIndices.size(); ++i) { if (m_contentChunks[m_cellsChunkIndices[i]].seqNum == csn) { diff --git a/src/lib/MSPUBParser2k.cpp b/src/lib/MSPUBParser2k.cpp index 615e63a..eaef631 100644 --- a/src/lib/MSPUBParser2k.cpp +++ b/src/lib/MSPUBParser2k.cpp @@ -617,7 +617,7 @@ bool MSPUBParser2k::parseGroup(librevenge::RVNGInputStream *input, unsigned seqN void MSPUBParser2k::assignShapeImgIndex(unsigned seqNum) { int i_dataIndex = -1; - for (unsigned j = 0; j < m_imageDataChunkIndices.size(); ++j) + for (size_t j = 0; j < m_imageDataChunkIndices.size(); ++j) { if (m_contentChunks.at(m_imageDataChunkIndices[j]).parentSeqNum == seqNum) { diff --git a/src/lib/MSPUBParser97.cpp b/src/lib/MSPUBParser97.cpp index 9ea7172..078e87b 100644 --- a/src/lib/MSPUBParser97.cpp +++ b/src/lib/MSPUBParser97.cpp @@ -87,7 +87,7 @@ void MSPUBParser97::parseContentsTextIfNecessary(librevenge::RVNGInputStream *in unsigned iParaEnd = 0, iSpanEnd = 0; unsigned currentParaIndex = 0; unsigned currentSpanIndex = 0; - for (unsigned iShapeEnd = 0; iShapeEnd < textInfo.m_shapeEnds.size(); ++iShapeEnd) + for (size_t iShapeEnd = 0; iShapeEnd < textInfo.m_shapeEnds.size(); ++iShapeEnd) { unsigned shapeEnd = std::min<unsigned>(textInfo.m_shapeEnds[iShapeEnd], textInfo.m_chars.size()); std::vector<TextParagraph> shapeParas; @@ -168,7 +168,7 @@ std::vector<MSPUBParser97::SpanInfo97> MSPUBParser97::getSpansInfo( spanEnds.push_back(readU32(input) - start); } std::vector<unsigned char> spanStyleIndices; - for (unsigned j = 0; j < spanEnds.size(); ++j) + for (size_t j = 0; j < spanEnds.size(); ++j) { spanStyleIndices.push_back(readU8(input)); } @@ -186,7 +186,7 @@ std::vector<MSPUBParser97::SpanInfo97> MSPUBParser97::getSpansInfo( stylesByIndex[index] = readCharacterStyle(input, length); input->seek(nextOffset, librevenge::RVNG_SEEK_SET); } - for (unsigned j = 0; j < spanEnds.size(); ++j) + for (size_t j = 0; j < spanEnds.size(); ++j) { ret.push_back(SpanInfo97(spanEnds[j], j < spanStyleIndices.size() ? stylesByIndex[spanStyleIndices[j]] : CharacterStyle())); diff --git a/src/lib/PolygonUtils.cpp b/src/lib/PolygonUtils.cpp index 17f3515..3497b49 100644 --- a/src/lib/PolygonUtils.cpp +++ b/src/lib/PolygonUtils.cpp @@ -5879,7 +5879,7 @@ librevenge::RVNGPropertyList calcClipPath(const std::vector<Vertex> &verts, doub librevenge::RVNGString sValue; sValue.sprintf("M %f %f", (double)vector.m_x, (double)vector.m_y); clipString.append(sValue); - for (unsigned i = 1; i < verts.size(); ++i) + for (size_t i = 1; i < verts.size(); ++i) { Vector2D vector2(x + scaleX * verts[i].m_x, y + scaleY * verts[i].m_y); vector2 = transform.transformWithOrigin(vector2, center); |