diff options
Diffstat (limited to 'drape/texture_of_colors.hpp')
-rw-r--r-- | drape/texture_of_colors.hpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drape/texture_of_colors.hpp b/drape/texture_of_colors.hpp index 619b73314b..c204882d89 100644 --- a/drape/texture_of_colors.hpp +++ b/drape/texture_of_colors.hpp @@ -14,8 +14,8 @@ namespace dp class ColorKey : public Texture::Key { public: - ColorKey(Color color) : Texture::Key(), m_color(color) {} - virtual Texture::ResourceType GetType() const { return Texture::Color; } + explicit ColorKey(Color color) : Texture::Key(), m_color(color) {} + virtual Texture::ResourceType GetType() const { return Texture::ResourceType::Color; } Color m_color; }; @@ -23,14 +23,14 @@ public: class ColorResourceInfo : public Texture::ResourceInfo { public: - ColorResourceInfo(m2::RectF const & texRect) : Texture::ResourceInfo(texRect) { } - virtual Texture::ResourceType GetType() const { return Texture::Color; } + explicit ColorResourceInfo(m2::RectF const & texRect) : Texture::ResourceInfo(texRect) { } + virtual Texture::ResourceType GetType() const { return Texture::ResourceType::Color; } }; class ColorPalette { public: - ColorPalette(m2::PointU const & canvasSize); + explicit ColorPalette(m2::PointU const & canvasSize); ref_ptr<Texture::ResourceInfo> ReserveResource(bool predefined, ColorKey const & key, bool & newResource); ref_ptr<Texture::ResourceInfo> MapResource(ColorKey const & key, bool & newResource); @@ -57,14 +57,14 @@ private: std::mutex m_mappingLock; }; -class ColorTexture : public DynamicTexture<ColorPalette, ColorKey, Texture::Color> +class ColorTexture : public DynamicTexture<ColorPalette, ColorKey, Texture::ResourceType::Color> { - typedef DynamicTexture<ColorPalette, ColorKey, Texture::Color> TBase; + typedef DynamicTexture<ColorPalette, ColorKey, Texture::ResourceType::Color> TBase; public: ColorTexture(m2::PointU const & size, ref_ptr<HWTextureAllocator> allocator) : m_palette(size) { - TBase::TextureParams params{size, TextureFormat::RGBA8, gl_const::GLNearest, false /* m_usePixelBuffer */}; + TBase::TextureParams params{size, TextureFormat::RGBA8, TextureFilter::Nearest, false /* m_usePixelBuffer */}; TBase::Init(allocator, make_ref(&m_palette), params); } |