From 408cb6ee57fdf10b15ecd49aa44f2d2130daec01 Mon Sep 17 00:00:00 2001
From: Bilal Elmoussaoui <belmouss@redhat.com>
Date: Tue, 11 Jun 2024 20:39:35 +0200
Subject: [PATCH] clutter: Drop Color.to_pixel

Keep the function around as Color.hash

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3802>
---
 clutter/clutter/clutter-color.c | 31 ++++++++-----------------------
 clutter/clutter/clutter-color.h |  3 ---
 2 files changed, 8 insertions(+), 26 deletions(-)

diff --git a/clutter/clutter/clutter-color.c b/clutter/clutter/clutter-color.c
index 6ba2727eb..15a9aa9ab 100644
--- a/clutter/clutter/clutter-color.c
+++ b/clutter/clutter/clutter-color.c
@@ -184,26 +184,6 @@ clutter_color_from_hls (ClutterColor *color,
   color->blue  = floorf (clr[2] * 255.0 + 0.5);
 }
 
-/**
- * clutter_color_to_pixel:
- * @color: a #ClutterColor
- *
- * Converts @color into a packed 32 bit integer, containing
- * all the four 8 bit channels used by #ClutterColor.
- *
- * Return value: a packed color
- */
-guint32
-clutter_color_to_pixel (const ClutterColor *color)
-{
-  g_return_val_if_fail (color != NULL, 0);
-
-  return (color->alpha       |
-          color->blue  << 8  |
-          color->green << 16 |
-          color->red   << 24);
-}
-
 static inline void
 skip_whitespace (gchar **str)
 {
@@ -592,7 +572,12 @@ clutter_color_equal (gconstpointer v1,
 guint
 clutter_color_hash (gconstpointer v)
 {
-  return clutter_color_to_pixel ((const ClutterColor *) v);
+  const ClutterColor *color = v;
+
+  return (color->alpha       |
+          color->blue  << 8  |
+          color->green << 16 |
+          color->red   << 24);
 }
 
 /**
@@ -778,8 +763,8 @@ param_color_values_cmp (GParamSpec   *pspec,
   if (color1 == NULL)
     return color2 == NULL ? 0 : -1;
 
-  pixel1 = clutter_color_to_pixel (color1);
-  pixel2 = clutter_color_to_pixel (color2);
+  pixel1 = clutter_color_hash (color1);
+  pixel2 = clutter_color_hash (color2);
 
   if (pixel1 < pixel2)
     return -1;
diff --git a/clutter/clutter/clutter-color.h b/clutter/clutter/clutter-color.h
index 687bad7df..eff18da11 100644
--- a/clutter/clutter/clutter-color.h
+++ b/clutter/clutter/clutter-color.h
@@ -101,9 +101,6 @@ void          clutter_color_from_hls    (ClutterColor       *color,
                                          gfloat              luminance,
                                          gfloat              saturation);
 
-CLUTTER_EXPORT
-guint32       clutter_color_to_pixel    (const ClutterColor *color);
-
 CLUTTER_EXPORT
 guint         clutter_color_hash        (gconstpointer       v);
 CLUTTER_EXPORT