Browse Source

Text: fix ambiguous function overloads.

I hope this won't break stuff.
pull/205/head
Vladimír Vondruš 8 years ago
parent
commit
d8399fe317
  1. 8
      src/Magnum/Text/GlyphCache.h

8
src/Magnum/Text/GlyphCache.h

@ -68,14 +68,14 @@ class MAGNUM_TEXT_EXPORT GlyphCache {
* although the actual glyph cache texture has @p size. Glyph * although the actual glyph cache texture has @p size. Glyph
* @p padding can be used to account for e.g. glyph shadows. * @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 * @brief Constructor
* *
* Same as calling the above with @p originalSize and @p size the same. * 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 * @brief Constructor
@ -85,14 +85,14 @@ class MAGNUM_TEXT_EXPORT GlyphCache {
* ES2 uses @extension{EXT,texture_rg}, if available, or * ES2 uses @extension{EXT,texture_rg}, if available, or
* @ref TextureFormat::Luminance as fallback. * @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 * @brief Constructor
* *
* Same as calling the above with @p originalSize and @p size the same. * 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(); virtual ~GlyphCache();

Loading…
Cancel
Save