From ca1b42450f3ef2b29edc89c5e9ed3e11fd1299f6 Mon Sep 17 00:00:00 2001 From: Sergey Yershov Date: Wed, 23 Sep 2015 14:19:59 +0300 Subject: [PATCH] Fix source code warnings --- coding/png_memory_encoder.cpp | 2 +- coding/png_memory_encoder.hpp | 2 +- generator/feature_sorter.cpp | 2 +- generator/polygonizer.hpp | 2 +- generator/tesselator.hpp | 2 +- indexer/features_offsets_table.cpp | 2 +- indexer/indexer_tests/features_offsets_table_test.cpp | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/coding/png_memory_encoder.cpp b/coding/png_memory_encoder.cpp index 36f9fba90c..26c43826f4 100644 --- a/coding/png_memory_encoder.cpp +++ b/coding/png_memory_encoder.cpp @@ -6,7 +6,7 @@ namespace il { -void EncodePngToMemory(size_t width, size_t height, +void EncodePngToMemory(uint32_t width, uint32_t height, vector const & rgba, vector & out) { diff --git a/coding/png_memory_encoder.hpp b/coding/png_memory_encoder.hpp index 835c67d950..dd2c5b632e 100644 --- a/coding/png_memory_encoder.hpp +++ b/coding/png_memory_encoder.hpp @@ -6,7 +6,7 @@ namespace il { -void EncodePngToMemory(size_t width, size_t height, +void EncodePngToMemory(uint32_t width, uint32_t height, vector const & rgba, vector & out); diff --git a/generator/feature_sorter.cpp b/generator/feature_sorter.cpp index e44a2901b0..ba97d6a995 100644 --- a/generator/feature_sorter.cpp +++ b/generator/feature_sorter.cpp @@ -428,7 +428,7 @@ namespace feature bool const isLine = fb.IsLine(); bool const isArea = fb.IsArea(); - int const scalesStart = m_header.GetScalesCount() - 1; + int const scalesStart = static_cast(m_header.GetScalesCount()) - 1; for (int i = scalesStart; i >= 0; --i) { int const level = m_header.GetScale(i); diff --git a/generator/polygonizer.hpp b/generator/polygonizer.hpp index b69b0e8149..a6e9b3b845 100644 --- a/generator/polygonizer.hpp +++ b/generator/polygonizer.hpp @@ -152,7 +152,7 @@ namespace feature { m_Names.push_back(country->m_name); m_Buckets.push_back(new FeatureOutT(m_info.GetTmpFileName(country->m_name))); - country->m_index = m_Buckets.size()-1; + country->m_index = static_cast(m_Buckets.size())-1; } (*(m_Buckets[country->m_index]))(fb); diff --git a/generator/tesselator.hpp b/generator/tesselator.hpp index 39bb9b93cc..cd11cc6900 100644 --- a/generator/tesselator.hpp +++ b/generator/tesselator.hpp @@ -114,7 +114,7 @@ namespace tesselator void MakeTrianglesChain(PointsInfo const & points, iter_t start, vector & chain, bool goodOrder) const; size_t GetCount() const { return m_triangles.size(); } - Triangle GetTriangle(int i) const { return m_triangles[i]; } + Triangle GetTriangle(size_t i) const { return m_triangles[i]; } }; list m_triangles; diff --git a/indexer/features_offsets_table.cpp b/indexer/features_offsets_table.cpp index f9fd17a59b..2850a73cde 100644 --- a/indexer/features_offsets_table.cpp +++ b/indexer/features_offsets_table.cpp @@ -125,7 +125,7 @@ namespace feature uint32_t FeaturesOffsetsTable::GetFeatureOffset(size_t index) const { ASSERT_LESS(index, size(), ("Index out of bounds", index, size())); - return m_table.select(index); + return static_cast(m_table.select(index)); } size_t FeaturesOffsetsTable::GetFeatureIndexbyOffset(uint32_t offset) const diff --git a/indexer/indexer_tests/features_offsets_table_test.cpp b/indexer/indexer_tests/features_offsets_table_test.cpp index d3b91ba81a..d08cca7486 100644 --- a/indexer/indexer_tests/features_offsets_table_test.cpp +++ b/indexer/indexer_tests/features_offsets_table_test.cpp @@ -103,7 +103,7 @@ namespace feature FileWriter::DeleteFileX(indexFile); FeaturesOffsetsTable::Builder builder; - FeaturesVector::ForEachOffset(baseContainer.GetReader(DATA_FILE_TAG), [&builder](uint64_t offset) + FeaturesVector::ForEachOffset(baseContainer.GetReader(DATA_FILE_TAG), [&builder](uint32_t offset) { builder.PushOffset(offset); });