From fd987c9e4e7dbcf00d92422905cd21009342f6fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Mon, 2 Dec 2013 15:21:29 +0100 Subject: [PATCH] Text: clean up GlyphCache::insert(). Const is good is good. --- src/Text/GlyphCache.cpp | 10 ++++------ src/Text/GlyphCache.h | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/Text/GlyphCache.cpp b/src/Text/GlyphCache.cpp index ec43b95d0..75e82b236 100644 --- a/src/Text/GlyphCache.cpp +++ b/src/Text/GlyphCache.cpp @@ -85,16 +85,14 @@ std::vector GlyphCache::reserve(const std::vector& sizes) { return TextureTools::atlas(_size, sizes, _padding); } -void GlyphCache::insert(const UnsignedInt glyph, Vector2i position, Range2Di rectangle) { - position -= _padding; - rectangle.bottomLeft() -= _padding; - rectangle.topRight() += _padding; +void GlyphCache::insert(const UnsignedInt glyph, const Vector2i& position, const Range2Di& rectangle) { + const std::pair glyphData = {position-_padding, rectangle.padded(_padding)}; /* Overwriting "Not Found" glyph */ - if(glyph == 0) glyphs[0] = {position, rectangle}; + if(glyph == 0) glyphs[0] = glyphData; /* Inserting new glyph */ - else CORRADE_INTERNAL_ASSERT_OUTPUT(glyphs.insert({glyph, {position, rectangle}}).second); + else CORRADE_INTERNAL_ASSERT_OUTPUT(glyphs.insert({glyph, glyphData}).second); } void GlyphCache::setImage(const Vector2i& offset, const ImageReference2D& image) { diff --git a/src/Text/GlyphCache.h b/src/Text/GlyphCache.h index 8e45ab68a..5fa5ede88 100644 --- a/src/Text/GlyphCache.h +++ b/src/Text/GlyphCache.h @@ -176,7 +176,7 @@ class MAGNUM_TEXT_EXPORT GlyphCache { * See also @ref setImage() to upload glyph image. * @see @ref padding() */ - void insert(UnsignedInt glyph, Vector2i position, Range2Di rectangle); + void insert(UnsignedInt glyph, const Vector2i& position, const Range2Di& rectangle); /** * @brief Set cache image