From: Øyvind Kolås <pippin@gimp.org>
Date: Mon, 19 Aug 2019 18:44:33 +0000 (+0200)
Subject: cairo: remove on of the conversaions added in last commit
X-Git-Tag: archive/raspbian/1%0.1.106-3+rpi1^2~15^2~11^2~7
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=245f68f54b4e7b5f8fc1d8e4a508d032d6bd4b6b;p=babl.git

cairo: remove on of the conversaions added in last commit
---

diff --git a/extensions/cairo.c b/extensions/cairo.c
index 07a25ff..d1ccfb5 100644
--- a/extensions/cairo.c
+++ b/extensions/cairo.c
@@ -234,27 +234,6 @@ conv_cairo32_rgbaF_le (const Babl    *conversion,
 }
 
 
-static void
-conv_cairo24_rgbF_le (const Babl    *conversion,
-                      unsigned char *src,
-                      unsigned char *dst_char,
-                      long           samples)
-{
-  long n = samples;
-  float *dst = (void*)dst_char;
-  while (n--)
-    {
-      unsigned char blue   = *src++;
-      unsigned char green  = *src++;
-      unsigned char red    = *src++;
-
-      *dst++ = red / 255.0;
-      *dst++ = green / 255.0;
-      *dst++ = blue / 255.0;
-      src++;
-    }
-}
-
 static void
 conv_cairo24_cairo32_le (const Babl    *conversion,
                          unsigned char *src,
@@ -264,8 +243,6 @@ conv_cairo24_cairo32_le (const Babl    *conversion,
   long n = samples;
   while (n--)
     {
-      unsigned char alpha = src[3];
-
       *dst++ = (*src++);
       *dst++ = (*src++);
       *dst++ = (*src++);
@@ -573,8 +550,6 @@ init (void)
       babl_conversion_new (f32, babl_format ("R'aG'aB'aA float"), "linear",
                            conv_cairo32_rgbAF_le, NULL);
 
-      babl_conversion_new (f32, babl_format ("R'G'B'A float"), "linear",
-                           conv_cairo32_rgbaF_le, NULL);
 
       babl_conversion_new (f32, babl_format ("R'aG'aB'aA u8"), "linear",
                            conv_cairo32_rgbA8_le, NULL);
@@ -582,12 +557,13 @@ init (void)
       babl_conversion_new (f32, babl_format ("R'G'B'A u8"), "linear",
                            conv_cairo32_rgba8_le, NULL);
 
+
+      babl_conversion_new (f32, babl_format ("R'G'B'A float"), "linear",
+                           conv_cairo32_rgbaF_le, NULL);
+
       babl_conversion_new (f24, f32, "linear",
                            conv_cairo24_cairo32_le, NULL);
 
-      babl_conversion_new (f24, babl_format ("R'G'B' float"), "linear",
-                           conv_cairo24_rgbF_le, NULL);
-
       babl_conversion_new (babl_format ("R'aG'aB'aA u8"), f32, "linear",
                            conv_rgbA8_cairo32_le, NULL);