From 50fc3a0e64b9bcafd8aae2a3c14d9f3514b9e5fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Wed, 8 Feb 2023 16:48:04 +0100 Subject: [PATCH] Math: don't use auto in Color conversion snippets. It only adds more confusion to the matter, not less. --- doc/snippets/MagnumMath.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/snippets/MagnumMath.cpp b/doc/snippets/MagnumMath.cpp index b79e5a8c6..44a56cb57 100644 --- a/doc/snippets/MagnumMath.cpp +++ b/doc/snippets/MagnumMath.cpp @@ -776,8 +776,8 @@ static_cast(b); { /* [Color3-unpack] */ Color3ub a{0xff, 0x33, 0x66}; -auto bFromSrgb = Color3::fromSrgb(a); // {1.0f, 0.03311f, 0.1329f} -auto bFromLinear = Math::unpack(a); // {1.0f, 0.2f, 0.4f} +Color4 bFromSrgb = Color3::fromSrgb(a); // {1.0f, 0.03311f, 0.1329f} +Color4 bFromLinear = Math::unpack(a); // {1.0f, 0.2f, 0.4f} /* [Color3-unpack] */ static_cast(bFromLinear); static_cast(bFromSrgb); @@ -794,8 +794,8 @@ static_cast(srgb); { /* [Color3-pack] */ Color3 a{1.0f, 0.2f, 0.4f}; -auto bSrgb = a.toSrgb(); // {0xff, 0x7c, 0xaa} -auto bLinear = Math::pack(a); // {0xff, 0x33, 0x66} +Vector3ub bSrgb = a.toSrgb(); // {0xff, 0x7c, 0xaa} +Color3ub bLinear = Math::pack(a); // {0xff, 0x33, 0x66} /* [Color3-pack] */ static_cast(bLinear); static_cast(bSrgb); @@ -821,8 +821,8 @@ static_cast(b); { /* [Color4-unpack] */ Color4ub a{0xff, 0x33, 0x66, 0x99}; -auto bFromSrgb = Color4::fromSrgbAlpha(a); // {1.0f, 0.03311f, 0.1329f, 0.6f} -auto bFromLinear = Math::unpack(a); // {1.0f, 0.2f, 0.4f, 0.6f} +Color4 bFromSrgb = Color4::fromSrgbAlpha(a); // {1.0f, 0.0331f, 0.1329f, 0.6f} +Color4 bFromLinear = Math::unpack(a); // {1.0f, 0.2f, 0.4f, 0.6f} /* [Color4-unpack] */ static_cast(bFromLinear); static_cast(bFromSrgb); @@ -839,8 +839,8 @@ static_cast(srgbAlpha); { /* [Color4-pack] */ Color4 a{1.0f, 0.2f, 0.4f, 0.6f}; -auto bSrgb = a.toSrgbAlpha(); // {0xff, 0x7c, 0xaa, 0x99} -auto bLinear = Math::pack(a); // {0xff, 0x33, 0x66, 0x99} +Vector4ub bSrgb = a.toSrgbAlpha(); // {0xff, 0x7c, 0xaa, 0x99} +Color4ub bLinear = Math::pack(a); // {0xff, 0x33, 0x66, 0x99} /* [Color4-pack] */ static_cast(bLinear); static_cast(bSrgb);