diff --git a/doc/changelog.dox b/doc/changelog.dox index f27ae8510..c2adb08c3 100644 --- a/doc/changelog.dox +++ b/doc/changelog.dox @@ -173,6 +173,8 @@ See also: - Removed availability of @ref Math::Color3 and @ref Math::Color4 literals in the root namespace, deprecated since April 2016. Explicitly call @cpp using namespace Math::Literals; @ce instead. +- Removed uppercase `*HSV` APIs from @ref Math::Color3 and @ref Math::Color4, + deprecated since December 2016. Use the CamelCased `*Hsv` APIs instead. - Removed @cpp Math::normalize() @ce and @cpp Math::denormalize() @ce functions, deprecated since December 2016. Use @ref Math::pack() and @ref Math::unpack() instead. diff --git a/src/Magnum/Math/Color.h b/src/Magnum/Math/Color.h index aa0ab1339..d49fcc5e6 100644 --- a/src/Magnum/Math/Color.h +++ b/src/Magnum/Math/Color.h @@ -328,13 +328,6 @@ template class Color3: public Vector3 { */ typedef std::tuple, FloatingPointType, FloatingPointType> Hsv; - #ifdef MAGNUM_BUILD_DEPRECATED - /** @brief @copybrief Hsv - * @deprecated Use @ref Hsv instead. - */ - typedef CORRADE_DEPRECATED("use Hsv instead") Hsv HSV; - #endif - /** * @brief Create RGB color from HSV representation * @param hsv Color in HSV color space @@ -350,22 +343,6 @@ template class Color3: public Vector3 { return fromHsv(std::make_tuple(hue, saturation, value)); } - #ifdef MAGNUM_BUILD_DEPRECATED - /** @brief @copybrief fromHsv(const Hsv&) - * @deprecated Use @ref fromHsv(const Hsv&) instead. - */ - CORRADE_DEPRECATED("use fromHsv() instead") static Color3 fromHSV(const Hsv& hsv) { - return fromHsv(hsv); - } - /** @brief @copybrief fromHsv(Deg, FloatingPointType, FloatingPointType) - * @deprecated Use @ref fromHsv(Deg, FloatingPointType, FloatingPointType) - * instead. - */ - CORRADE_DEPRECATED("use fromHsv() instead") static Color3 fromHSV(Deg hue, FloatingPointType saturation, FloatingPointType value) { - return fromHsv(hue, saturation, value); - } - #endif - /** * @brief Create linear RGB color from sRGB representation * @param srgb Color in sRGB color space @@ -515,13 +492,6 @@ template class Color3: public Vector3 { return Implementation::toHsv(*this); } - #ifdef MAGNUM_BUILD_DEPRECATED - /** @brief @copybrief toHsv() - * @deprecated Use @ref toHsv() instead. - */ - CORRADE_DEPRECATED("use toHsv() instead") Hsv toHSV() const { return toHsv(); } - #endif - /** * @brief Hue * @return Hue in range @f$ [0.0, 360.0] @f$. @@ -649,13 +619,6 @@ class Color4: public Vector4 { /** @copydoc Color3::Hsv */ typedef typename Color3::Hsv Hsv; - #ifdef MAGNUM_BUILD_DEPRECATED - /** @brief @copybrief Hsv - * @deprecated Use @ref Hsv instead. - */ - typedef CORRADE_DEPRECATED("use Hsv instead") Hsv HSV; - #endif - /** * @brief Red color * @@ -734,22 +697,6 @@ class Color4: public Vector4 { return fromHsv(std::make_tuple(hue, saturation, value), alpha); } - #ifdef MAGNUM_BUILD_DEPRECATED - /** @brief @copybrief fromHsv(const Hsv&, T) - * @deprecated Use @ref fromHsv(const Hsv&, T) instead. - */ - CORRADE_DEPRECATED("use fromHsv() instead") static Color4 fromHSV(const Hsv& hsv, T a = Implementation::fullChannel()) { - return fromHsv(hsv, a); - } - /** @brief @copybrief fromHsv(Deg, FloatingPointType, FloatingPointType, T) - * @deprecated Use @ref fromHsv(Deg, FloatingPointType, FloatingPointType, T) - * instead. - */ - CORRADE_DEPRECATED("use fromHsv() instead") static Color4 fromHSV(Deg hue, FloatingPointType saturation, FloatingPointType value, T a = Implementation::fullChannel()) { - return fromHsv(hue, saturation, value, a); - } - #endif - /** * @brief Create linear RGBA color from sRGB + alpha representation * @param srgbAlpha Color in sRGB color space with linear alpha @@ -962,13 +909,6 @@ class Color4: public Vector4 { return Implementation::toHsv(Vector4::rgb()); } - #ifdef MAGNUM_BUILD_DEPRECATED - /** @brief @copybrief toHsv() - * @deprecated Use @ref toHsv() instead. - */ - CORRADE_DEPRECATED("use toHsv() instead") Hsv toHSV() const { return toHsv(); } - #endif - /** @copydoc Color3::hue() */ Deg hue() const { return Implementation::hue(Vector4::rgb());