From d8399fe3170dbf8d3c93edf4ae095c76bdcb1a11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Tue, 27 Feb 2018 19:59:56 +0100 Subject: [PATCH] Text: fix ambiguous function overloads. I hope this won't break stuff. --- src/Magnum/Text/GlyphCache.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Magnum/Text/GlyphCache.h b/src/Magnum/Text/GlyphCache.h index 7428f15fe..c885892dc 100644 --- a/src/Magnum/Text/GlyphCache.h +++ b/src/Magnum/Text/GlyphCache.h @@ -68,14 +68,14 @@ class MAGNUM_TEXT_EXPORT GlyphCache { * although the actual glyph cache texture has @p size. Glyph * @p padding can be used to account for e.g. glyph shadows. */ - explicit GlyphCache(TextureFormat internalFormat, const Vector2i& originalSize, const Vector2i& size, const Vector2i& padding = Vector2i()); + explicit GlyphCache(TextureFormat internalFormat, const Vector2i& originalSize, const Vector2i& size, const Vector2i& padding); /** * @brief Constructor * * Same as calling the above with @p originalSize and @p size the same. */ - explicit GlyphCache(TextureFormat internalFormat, const Vector2i& size, const Vector2i& padding = Vector2i()); + explicit GlyphCache(TextureFormat internalFormat, const Vector2i& size, const Vector2i& padding = {}); /** * @brief Constructor @@ -85,14 +85,14 @@ class MAGNUM_TEXT_EXPORT GlyphCache { * ES2 uses @extension{EXT,texture_rg}, if available, or * @ref TextureFormat::Luminance as fallback. */ - explicit GlyphCache(const Vector2i& originalSize, const Vector2i& size, const Vector2i& padding = Vector2i()); + explicit GlyphCache(const Vector2i& originalSize, const Vector2i& size, const Vector2i& padding); /** * @brief Constructor * * Same as calling the above with @p originalSize and @p size the same. */ - explicit GlyphCache(const Vector2i& size, const Vector2i& padding = Vector2i()); + explicit GlyphCache(const Vector2i& size, const Vector2i& padding = {}); virtual ~GlyphCache();