From 127af0f0f67bedd1f8b357492867aac8b10208f2 Mon Sep 17 00:00:00 2001 From: rachytski Date: Wed, 8 Dec 2010 01:32:43 +0200 Subject: [PATCH] warning fixes. --- map/render_queue_routine.cpp | 2 +- version/version.h | 11 +++++++++++ yg/texture.hpp | 8 ++++---- 3 files changed, 16 insertions(+), 5 deletions(-) create mode 100644 version/version.h diff --git a/map/render_queue_routine.cpp b/map/render_queue_routine.cpp index d3c3b96784..e29bb670b3 100644 --- a/map/render_queue_routine.cpp +++ b/map/render_queue_routine.cpp @@ -50,7 +50,7 @@ void RenderQueueRoutine::Cancel() m_currentRenderCommand->m_paintEvent->setIsCancelled(true); } -void RenderQueueRoutine::processResize(ScreenBase const & frameScreen) +void RenderQueueRoutine::processResize(ScreenBase const & /*frameScreen*/) { threads::MutexGuard guard(*m_renderState->m_mutex.get()); diff --git a/version/version.h b/version/version.h new file mode 100644 index 0000000000..2073bd4498 --- /dev/null +++ b/version/version.h @@ -0,0 +1,11 @@ +#pragma once +// This header is auto generated by script +namespace Version +{ + static unsigned int const MAJOR = 0; + static unsigned int const MINOR = 1; + static unsigned int const BUILD = 101207; + #define VERSION_STRING "0.1.101207.5950fce.altered" + #define VERSION_DATE_STRING "Tue Dec 7 22:57:25 UTC 2010" +} + diff --git a/yg/texture.hpp b/yg/texture.hpp index 9e85f42f46..0825c1d88d 100644 --- a/yg/texture.hpp +++ b/yg/texture.hpp @@ -201,7 +201,7 @@ namespace yg { lock(); view_t v = view(width(), height()); - gil::lodepng_read_and_convert_view((GetPlatform().ResourcesDir() + fileName).c_str(), v, typename Traits::color_converter()); + gil::lodepng_read_and_convert_view(GetPlatform().ReadPathForFile(fileName).c_str(), v, typename Traits::color_converter()); upload(&v(0, 0)); unlock(); } @@ -290,13 +290,13 @@ namespace yg } template - void Texture::dump(char const * fileName) + void Texture::dump(char const * /*fileName*/) { - readback(); +/* readback(); std::string const fullPath = GetPlatform().WritablePathForFile(fileName); #ifndef OMIM_GL_ES boost::gil::lodepng_write_view(fullPath.c_str(), gil::const_view(m_image)); -#endif +#endif*/ } template