RedAuburn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Warning fixes

Browse source
This commit is contained in:
Alex Zolotarev 2011-05-03 21:02:40 +02:00 • committed by Alex Zolotarev
parent d515d16822
commit c7626ce801
5 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
map/framework.cpp
View file

@ -355,7 +355,7 @@ void FrameWork<TModel>::AddRedrawCommandSure()
{
ofstream fout(GetPlatform().WritablePathForFile("benchmark_results.txt").c_str(), ios::app);
for (int i = 0; i < m_benchmarkResults.size(); ++i)
for (size_t i = 0; i < m_benchmarkResults.size(); ++i)
{
fout << GetPlatform().DeviceID() << " "
<< VERSION_STRING << " "
@ -441,7 +441,7 @@ void FrameWork<TModel>::AddRedrawCommandSure()
r = header.GetBounds();
}
catch (std::exception const & e)
catch (std::exception const &)
{
double x0, y0, x1, y1;
fin >> x0 >> y0 >> x1 >> y1;

2
map/framework.hpp
View file

@ -157,7 +157,7 @@ class FrameWork
};
vector<Benchmark> m_benchmarks;
int m_curBenchmark;
size_t m_curBenchmark;
void BenchmarkCommandFinished();
void NextBenchmarkCommand();

4
yg/glyph_cache.cpp
View file

@ -68,7 +68,7 @@ namespace yg
int charIDX;
for (int i = 0; i < fonts.size(); ++i)
for (size_t i = 0; i < fonts.size(); ++i)
{
font = fonts[i].get();
FTC_FaceID faceID = reinterpret_cast<FTC_FaceID>(font);
@ -85,7 +85,7 @@ namespace yg
#ifdef DEBUG
for (int i = 0; i < m_impl->m_unicodeBlocks.size(); ++i)
for (size_t i = 0; i < m_impl->m_unicodeBlocks.size(); ++i)
{
if (m_impl->m_unicodeBlocks[i].hasSymbol(key.m_id))
{

8
yg/glyph_cache_impl.cpp
View file

@ -111,7 +111,7 @@ namespace yg
void GlyphCacheImpl::addFonts(vector<string> const & fontNames)
{
for (int i = 0; i < fontNames.size(); ++i)
for (size_t i = 0; i < fontNames.size(); ++i)
addFont(fontNames[i].c_str());
/* LOG(LINFO, ("----------------------------"));
@ -152,7 +152,7 @@ namespace yg
void GlyphCacheImpl::addFont(char const * fileName)
{
string fontName = extract_name(fileName);
for (int i = 0; i < fontName.size(); ++i)
for (size_t i = 0; i < fontName.size(); ++i)
if (fontName[i] == ' ')
fontName[i] = '_';
@ -211,12 +211,12 @@ namespace yg
/// checking blacklist and whitelist
for (int i = 0; i < ubIt->m_blacklist.size(); ++i)
for (size_t i = 0; i < ubIt->m_blacklist.size(); ++i)
if (ubIt->m_blacklist[i] == fontName)
/// if font is blacklisted for this unicode block
ubIt->m_coverage.back() = -1;
for (int i = 0; i < ubIt->m_whitelist.size(); ++i)
for (size_t i = 0; i < ubIt->m_whitelist.size(); ++i)
if (ubIt->m_whitelist[i] == fontName)
{
if (ubIt->m_coverage.back() == -1)

4
yg/skin.cpp
View file

@ -43,7 +43,7 @@ namespace yg
addClearPageFn(bind(&Skin::clearPageHandles, this, _1), 0);
for (size_t i = 0; i < count; ++i)
for (int i = 0; i < count; ++i)
{
uint8_t pageID = (uint8_t)m_pages.size();
m_pages.push_back(make_shared_ptr(new SkinPage(m_resourceManager, pageID, m_resourceManager->fillSkinAlpha())));
@ -57,7 +57,7 @@ namespace yg
addClearPageFn(bind(&Skin::clearPageHandles, this, _1), 0);
for (size_t i = 0; i < count; ++i)
for (int i = 0; i < count; ++i)
{
uint8_t pageID = (uint8_t)m_pages.size();
m_pages.push_back(make_shared_ptr(new SkinPage(m_resourceManager, pageID, m_resourceManager->fillSkinAlpha())));