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

changes according to code review.

Browse source
This commit is contained in:
rachytski 2012-07-30 01:22:21 -07:00 • committed by Alex Zolotarev
parent 4d56714de8
commit d7368e7e2e
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
map/queued_renderer.cpp
View file

@ -94,9 +94,9 @@ bool QueuedRenderer::RenderQueuedCommands(int pipelineNum)
yg::gl::Packet::EType bucketType = m_Pipelines[pipelineNum].m_Type;
while ((it = m_Pipelines[pipelineNum].m_FrameCommands.begin())
!= m_Pipelines[pipelineNum].m_FrameCommands.end())
while (!m_Pipelines[pipelineNum].m_FrameCommands.empty())
{
it = m_Pipelines[pipelineNum].m_FrameCommands.begin();
if (it->m_command)
it->m_command->setIsDebugging(m_IsDebugging);

12
yg/geometry_renderer.cpp
View file

@ -85,7 +85,7 @@ namespace yg
void GeometryRenderer::uploadTextureImpl(SkinPage::TUploadQueue const & uploadQueue,
unsigned start, unsigned end,
size_t start, size_t end,
shared_ptr<BaseTexture> const & texture,
bool shouldAddCheckPoint)
{
@ -117,11 +117,11 @@ namespace yg
/// tracking the number of bytes downloaded onto the texture
/// in a single shot.
unsigned bytesUploaded = 0;
unsigned bytesPerPixel = yg::formatSize(resourceManager()->params().m_texFormat);
unsigned prev = 0;
size_t bytesUploaded = 0;
size_t bytesPerPixel = yg::formatSize(resourceManager()->params().m_texFormat);
size_t prev = 0;
for (unsigned i = 0; i < uploadQueue.size(); ++i)
for (size_t i = 0; i < uploadQueue.size(); ++i)
{
shared_ptr<ResourceStyle> const & style = uploadQueue[i];
@ -135,7 +135,7 @@ namespace yg
}
}
if (uploadQueue.size())
if (!uploadQueue.empty())
{
uploadTextureImpl(uploadQueue, prev, uploadQueue.size(), texture, false);
bytesUploaded = 0;

4
yg/geometry_renderer.hpp
View file

@ -24,8 +24,8 @@ namespace yg
DisplayList * m_displayList;
void uploadTextureImpl(SkinPage::TUploadQueue const & uploadQueue,
unsigned start,
unsigned end,
size_t start,
size_t end,
shared_ptr<BaseTexture> const & texture,
bool shouldAddCheckPoint);