diff options
author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2017-07-11 19:15:10 +0300 |
---|---|---|
committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2017-07-12 20:42:29 +0300 |
commit | 2fae373fc9da1a5ed61b5114d8c982073734826d (patch) | |
tree | 105ce580cc7df0cf9cf0a9997c4702bc76b3faeb /src/mbgl/gl | |
parent | 21031b624ffabf92bf284c830b3d13a3ae045460 (diff) | |
download | qtlocation-mapboxgl-2fae373fc9da1a5ed61b5114d8c982073734826d.tar.gz |
[core] GCC 4.9 is unable to deduce ctors when using bracket init
Diffstat (limited to 'src/mbgl/gl')
-rw-r--r-- | src/mbgl/gl/texture.hpp | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/src/mbgl/gl/texture.hpp b/src/mbgl/gl/texture.hpp index 5330689ac2..625e69233a 100644 --- a/src/mbgl/gl/texture.hpp +++ b/src/mbgl/gl/texture.hpp @@ -8,12 +8,24 @@ namespace gl { class Texture { public: + Texture(Size size_, UniqueTexture texture_, + TextureFilter filter_ = TextureFilter::Nearest, + TextureMipMap mipmap_ = TextureMipMap::No, + TextureWrap wrapX_ = TextureWrap::Clamp, + TextureWrap wrapY_ = TextureWrap::Clamp) + : size(std::move(size_)), + texture(std::move(texture_)), + filter(filter_), + mipmap(mipmap_), + wrapX(wrapX_), + wrapY(wrapY_) {} + Size size; UniqueTexture texture; - TextureFilter filter = TextureFilter::Nearest; - TextureMipMap mipmap = TextureMipMap::No; - TextureWrap wrapX = TextureWrap::Clamp; - TextureWrap wrapY = TextureWrap::Clamp; + TextureFilter filter; + TextureMipMap mipmap; + TextureWrap wrapX; + TextureWrap wrapY; }; } // namespace gl |