From c1f6a8f2173e937a00c63302931b3aa1e6153778 Mon Sep 17 00:00:00 2001
From: Alx Sa <cmyk.student@gmail.com>
Date: Sun, 8 Sep 2024 18:35:20 +0000
Subject: [PATCH] libgimpcolor: Remove unneeded GimpRGB functions

As the Van Gogh LIC plug-in was the last
area of the code that used gimp_rgba_add ()
and gimp_rgba_multiply (), they can be
removed.
---
 libgimpcolor/gimpbilinear.c |  5 +++--
 libgimpcolor/gimpcolor.def  |  2 --
 libgimpcolor/gimprgb.c      | 25 -------------------------
 libgimpcolor/gimprgb.h      |  5 -----
 4 files changed, 3 insertions(+), 34 deletions(-)

diff --git a/libgimpcolor/gimpbilinear.c b/libgimpcolor/gimpbilinear.c
index 26fc342648..ba3e4a53a3 100644
--- a/libgimpcolor/gimpbilinear.c
+++ b/libgimpcolor/gimpbilinear.c
@@ -175,8 +175,9 @@ gimp_bilinear_rgb (gdouble    x,
   gdouble  a[4]  = { 1.0, 1.0, 1.0, 1.0 };
   gdouble  alpha = 1.0;
 
-  for (gint i = 0; i < 4; i++)
+  for (gint i = 0; i < 3; i++)
     retvalues[i] = 0.0;
+  retvalues[3] = 1.0;
 
   g_return_if_fail (values != NULL);
 
@@ -207,7 +208,7 @@ gimp_bilinear_rgb (gdouble    x,
       for (gint i = 0; i < 3; i++)
         {
           m0 = ix * a[0] * values[0 + i] + x * a[1] * values[4 + i];
-          m1 = ix * a[2] * values[8 + 1] + x * a[3] * values[12 + i];
+          m1 = ix * a[2] * values[8 + i] + x * a[3] * values[12 + i];
 
           retvalues[i] = (iy * m0 + y * m1) / alpha;
         }
diff --git a/libgimpcolor/gimpcolor.def b/libgimpcolor/gimpcolor.def
index b456254254..cc148d199c 100644
--- a/libgimpcolor/gimpcolor.def
+++ b/libgimpcolor/gimpcolor.def
@@ -87,9 +87,7 @@ EXPORTS
 	gimp_rgb_set_alpha
 	gimp_rgb_set_uchar
 	gimp_rgb_to_hsl
-	gimp_rgba_add
 	gimp_rgba_distance
 	gimp_rgba_get_uchar
-	gimp_rgba_multiply
 	gimp_rgba_set
 	gimp_rgba_set_uchar
diff --git a/libgimpcolor/gimprgb.c b/libgimpcolor/gimprgb.c
index e5fed9a7a4..9102e0bad7 100644
--- a/libgimpcolor/gimprgb.c
+++ b/libgimpcolor/gimprgb.c
@@ -322,31 +322,6 @@ gimp_rgba_get_uchar (const GimpRGB *rgba,
   if (a) *a = ROUND (CLAMP (rgba->a, 0.0, 1.0) * 255.0);
 }
 
-void
-gimp_rgba_add (GimpRGB       *rgba1,
-               const GimpRGB *rgba2)
-{
-  g_return_if_fail (rgba1 != NULL);
-  g_return_if_fail (rgba2 != NULL);
-
-  rgba1->r += rgba2->r;
-  rgba1->g += rgba2->g;
-  rgba1->b += rgba2->b;
-  rgba1->a += rgba2->a;
-}
-
-void
-gimp_rgba_multiply (GimpRGB *rgba,
-                    gdouble  factor)
-{
-  g_return_if_fail (rgba != NULL);
-
-  rgba->r *= factor;
-  rgba->g *= factor;
-  rgba->b *= factor;
-  rgba->a *= factor;
-}
-
 gdouble
 gimp_rgba_distance (const GimpRGB *rgba1,
                     const GimpRGB *rgba2)
diff --git a/libgimpcolor/gimprgb.h b/libgimpcolor/gimprgb.h
index 0bf6eac995..14b23d3f38 100644
--- a/libgimpcolor/gimprgb.h
+++ b/libgimpcolor/gimprgb.h
@@ -99,11 +99,6 @@ void      gimp_rgba_get_uchar      (const GimpRGB *rgba,
                                     guchar        *blue,
                                     guchar        *alpha);
 
-void      gimp_rgba_add            (GimpRGB       *rgba1,
-                                    const GimpRGB *rgba2);
-void      gimp_rgba_multiply       (GimpRGB       *rgba,
-                                    gdouble        factor);
-
 gdouble   gimp_rgba_distance       (const GimpRGB *rgba1,
                                     const GimpRGB *rgba2);