[gegl] buffer: improve workarounds for legacy babl

[Øyvind "pippin" Kolås <ok src gnome org>]

commit 32e0446db0bc2f1f3e1232a6b78e37136c68cee3
Author: Øyvind Kolås <pippin gimp org>
Date:   Sat Aug 20 10:38:00 2022 +0200

    buffer: improve workarounds for legacy babl

 gegl/buffer/gegl-sampler-cubic.c   | 5 ++---
 gegl/buffer/gegl-sampler-linear.c  | 5 ++---
 gegl/buffer/gegl-sampler-lohalo.c  | 5 ++---
 gegl/buffer/gegl-sampler-nearest.c | 5 ++---
 gegl/buffer/gegl-sampler-nohalo.c  | 5 ++---
 5 files changed, 10 insertions(+), 15 deletions(-)
---
diff --git a/gegl/buffer/gegl-sampler-cubic.c b/gegl/buffer/gegl-sampler-cubic.c
index d1847865b..03b29a4a4 100644
--- a/gegl/buffer/gegl-sampler-cubic.c
+++ b/gegl/buffer/gegl-sampler-cubic.c
@@ -228,11 +228,10 @@ gegl_sampler_cubic_get (      GeglSampler       *self,
                                     repeat_mode);
 
 #if (BABL_MINOR_VERSION >=1) && (BABL_MICRO_VERSION >= 90)
-    self->fish_process 
+    self->fish_process (self->fish, (void*)result, (void*)output, 1, NULL);
 #else
-    babl_process
+    babl_process (self->fish, (void*)result, (void*)output, 1);
 #endif
-    (self->fish, (void*)result, (void*)output, 1, NULL);
   }
 }
 
diff --git a/gegl/buffer/gegl-sampler-linear.c b/gegl/buffer/gegl-sampler-linear.c
index e17d308d9..6c714b3fb 100644
--- a/gegl/buffer/gegl-sampler-linear.c
+++ b/gegl/buffer/gegl-sampler-linear.c
@@ -195,10 +195,9 @@ gegl_sampler_linear_get (      GeglSampler       *self,
                                      repeat_mode);
 
 #if (BABL_MINOR_VERSION >=1) && (BABL_MICRO_VERSION >= 90)
-    self->fish_process 
+    self->fish_process (self->fish, (void*)result, (void*)output, 1, NULL);
 #else
-    babl_process
+    babl_process (self->fish, (void*)result, (void*)output, 1);
 #endif
-     (self->fish, (void*)result, (void*)output, 1, NULL);
   }
 }
diff --git a/gegl/buffer/gegl-sampler-lohalo.c b/gegl/buffer/gegl-sampler-lohalo.c
index 7fa944dd0..0e7b12c52 100644
--- a/gegl/buffer/gegl-sampler-lohalo.c
+++ b/gegl/buffer/gegl-sampler-lohalo.c
@@ -999,11 +999,10 @@ gegl_sampler_lohalo_get (      GeglSampler*    restrict  self,
      * Ship out the result:
      */
 #if (BABL_MINOR_VERSION >=1) && (BABL_MICRO_VERSION >= 90)
-    self->fish_process 
+    self->fish_process (self->fish, (void*)newval, (void*)output, 1, NULL);
 #else
-    babl_process
+    babl_process (self->fish, (void*)newval, (void*)output, 1);
 #endif
-      (self->fish, (void*)newval, (void*)output, 1, NULL);
     return;
   }
 }
diff --git a/gegl/buffer/gegl-sampler-nearest.c b/gegl/buffer/gegl-sampler-nearest.c
index 7b9b8b7b5..49cde46ec 100644
--- a/gegl/buffer/gegl-sampler-nearest.c
+++ b/gegl/buffer/gegl-sampler-nearest.c
@@ -196,11 +196,10 @@ gegl_sampler_get_pixel (GeglSampler    *sampler,
              (offsety * tile_width + offsetx) * nearest_sampler->buffer_bpp;
 
 #if (BABL_MINOR_VERSION >=1) && (BABL_MICRO_VERSION >= 90)
-        sampler->fish_process
+    sampler->fish_process (sampler->fish, (void*)tp, (void*)buf, 1, NULL);
 #else
-        babl_process
+    babl_process (sampler->fish, (void*)tp, (void*)buf, 1);
 #endif
-          (sampler->fish, (void*)tp, (void*)buf, 1, NULL);
       }
   }
 
diff --git a/gegl/buffer/gegl-sampler-nohalo.c b/gegl/buffer/gegl-sampler-nohalo.c
index f21ff2a79..c38fb4db6 100644
--- a/gegl/buffer/gegl-sampler-nohalo.c
+++ b/gegl/buffer/gegl-sampler-nohalo.c
@@ -1921,11 +1921,10 @@ gegl_sampler_nohalo_get (      GeglSampler*    restrict  self,
        * Ship out the result:
        */
 #if (BABL_MINOR_VERSION >=1) && (BABL_MICRO_VERSION >= 90)
-      self->fish_process
+        self->fish_process (self->fish, (void*)newval, (void*)output, 1, NULL);
 #else
-      babl_process
+        babl_proces (self->fish, (void*)newval, (void*)output, 1);
 #endif
-         (self->fish, (void*)newval, (void*)output, 1, NULL);
       return;
     }
   }