Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorr.kuznetsov <r.kuznetsov@corp.mail.ru>2018-09-05 15:20:10 +0300
committerAleksey Belousov <beloal@users.noreply.github.com>2018-09-25 12:33:08 +0300
commitd1074729e0d0c63ab887efb866903bc99181f919 (patch)
treef1d70b92271c7c09eae2293a2b233572730be13c /drape/symbols_texture.cpp
parenta81f1fc4d1f698a0f0aaaa1e7a29f41516b05d11 (diff)
[drape][metal] Fixed unit tests, refactored a bit CurrentApiVersion.
Diffstat (limited to 'drape/symbols_texture.cpp')
-rw-r--r--drape/symbols_texture.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/drape/symbols_texture.cpp b/drape/symbols_texture.cpp
index bb0adc6f22..ce9bc4ea77 100644
--- a/drape/symbols_texture.cpp
+++ b/drape/symbols_texture.cpp
@@ -203,7 +203,7 @@ SymbolsTexture::SymbolsTexture(ref_ptr<dp::GraphicsContext> context, std::string
std::string const & textureName, ref_ptr<HWTextureAllocator> allocator)
: m_name(textureName)
{
- Load(std::move(context), skinPathName, std::move(allocator));
+ Load(context, skinPathName, allocator);
}
void SymbolsTexture::Load(ref_ptr<dp::GraphicsContext> context, std::string const & skinPathName,
@@ -222,13 +222,13 @@ void SymbolsTexture::Load(ref_ptr<dp::GraphicsContext> context, std::string cons
p.m_width = width;
p.m_height = height;
- Create(std::move(context), p, make_ref(data));
+ Create(context, p, make_ref(data));
};
auto failureHandler = [this, context](std::string const & reason)
{
LOG(LERROR, (reason));
- Fail(std::move(context));
+ Fail(context);
};
LoadSymbols(skinPathName, m_name, true /* convertToUV */, definitionInserter,
@@ -241,7 +241,7 @@ void SymbolsTexture::Invalidate(ref_ptr<dp::GraphicsContext> context, std::strin
Destroy();
m_definition.clear();
- Load(std::move(context), skinPathName, std::move(allocator));
+ Load(context, skinPathName, allocator);
}
ref_ptr<Texture::ResourceInfo> SymbolsTexture::FindResource(Texture::Key const & key, bool & newResource)