From eb58f4e521475c6b1bcddcc834ad121da43caeb3 Mon Sep 17 00:00:00 2001 From: Alex Zolotarev Date: Wed, 16 Nov 2011 19:47:43 +0300 Subject: [PATCH] Correct constructor usage --- yg/skin_page.cpp | 2 +- yg/skin_page.hpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/yg/skin_page.cpp b/yg/skin_page.cpp index 0036e5e717..bbde19885b 100644 --- a/yg/skin_page.cpp +++ b/yg/skin_page.cpp @@ -54,10 +54,10 @@ namespace yg char const * name, uint8_t pipelineID) : m_texture(resourceManager->getTexture(name)), + m_packer(m_texture->width(), m_texture->height(), 0x00FFFFFF - 1), m_usage(EStaticUsage), m_pipelineID(pipelineID) { - m_packer = m2::Packer(m_texture->width(), m_texture->height(), 0x00FFFFFF - 1); } SkinPage::SkinPage(shared_ptr const & resourceManager, diff --git a/yg/skin_page.hpp b/yg/skin_page.hpp index 1cd767eea4..b5acce20fc 100644 --- a/yg/skin_page.hpp +++ b/yg/skin_page.hpp @@ -69,13 +69,14 @@ namespace yg typedef map TGlyphMap; TGlyphMap m_glyphMap; - m2::Packer m_packer; /// made mutable to implement lazy reservation of texture /// @{ mutable shared_ptr m_texture; mutable shared_ptr m_resourceManager; /// @} + m2::Packer m_packer; + TUploadQueue m_uploadQueue; typedef vector TFonts;