[Bf-blender-cvs] [9096b0490db] temp-explicit-colors: Cleanup: to_byte_decoded => decode

[Jeroen Bakker]

Commit: 9096b0490db4ce198d4004624ac2e0ff611ce97e
Author: Jeroen Bakker
Date:   Tue May 25 08:11:21 2021 +0200
Branches: temp-explicit-colors
https://developer.blender.org/rB9096b0490db4ce198d4004624ac2e0ff611ce97e

Cleanup: to_byte_decoded => decode

===================================================================

M	source/blender/blenkernel/intern/geometry_component_mesh.cc
M	source/blender/blenlib/BLI_color.hh
M	source/blender/blenlib/tests/BLI_color_test.cc

===================================================================

diff --git a/source/blender/blenkernel/intern/geometry_component_mesh.cc b/source/blender/blenkernel/intern/geometry_component_mesh.cc
index a3ecc873341..f1b07ffefc5 100644
--- a/source/blender/blenkernel/intern/geometry_component_mesh.cc
+++ b/source/blender/blenkernel/intern/geometry_component_mesh.cc
@@ -788,7 +788,7 @@ static void set_loop_uv(MLoopUV &uv, float2 co)
 static ColorGeometry4f get_loop_color(const MLoopCol &col)
 {
   ColorGeometry4b encoded_color = ColorGeometry4b(col.r, col.g, col.b, col.a);
-  ColorGeometry4f linear_color = encoded_color.to_byte_decoded();
+  ColorGeometry4f linear_color = encoded_color.decode();
   return linear_color;
 }
 
diff --git a/source/blender/blenlib/BLI_color.hh b/source/blender/blenlib/BLI_color.hh
index dd740c470a7..c8af6ce8128 100644
--- a/source/blender/blenlib/BLI_color.hh
+++ b/source/blender/blenlib/BLI_color.hh
@@ -234,7 +234,7 @@ class ColorSceneLinearByteEncoded4b final
   /**
    * Convert to back to float color.
    **/
-  ColorSceneLinear4f<Alpha> to_byte_decoded() const
+  ColorSceneLinear4f<Alpha> decode() const
   {
     ColorSceneLinear4f<Alpha> decoded;
     srgb_to_linearrgb_uchar4(decoded, *this);
diff --git a/source/blender/blenlib/tests/BLI_color_test.cc b/source/blender/blenlib/tests/BLI_color_test.cc
index 80829bcf66e..75cba87a28e 100644
--- a/source/blender/blenlib/tests/BLI_color_test.cc
+++ b/source/blender/blenlib/tests/BLI_color_test.cc
@@ -121,7 +121,7 @@ TEST(color, SceneLinearByteEncoding)
 TEST(color, SceneLinearByteDecoding)
 {
   ColorSceneLinearByteEncoded4b<eAlpha::Premultiplied> encoded(225, 188, 137, 128);
-  ColorSceneLinear4f<eAlpha::Premultiplied> decoded = encoded.to_byte_decoded();
+  ColorSceneLinear4f<eAlpha::Premultiplied> decoded = encoded.decode();
   EXPECT_NEAR(0.75f, decoded.r, 0.01f);
   EXPECT_NEAR(0.5f, decoded.g, 0.01f);
   EXPECT_NEAR(0.25f, decoded.b, 0.01f);