[babl] code style review



commit 30cf039d8f7c0523853fc496a093c7bea4a7fc61
Author: Nuno Ferreira <nuno360 gmail com>
Date:   Tue Feb 26 19:47:16 2019 +0000

    code style review
    
    fixed style of function headers in the babl/extensions folder

 extensions/CIE.c             | 303 ++++++++++++++++++++++++-------------------
 extensions/HCY.c             |  67 +++++-----
 extensions/HSL.c             |  85 +++++++-----
 extensions/HSV.c             |  78 ++++++-----
 extensions/cairo.c           |  74 ++++++++---
 extensions/double.c          |  21 ++-
 extensions/fast-float.c      |  41 +++---
 extensions/float.c           |  34 +++--
 extensions/gegl-fixups.c     |  65 +++++++---
 extensions/gggl-lies.c       | 220 ++++++++++++++++++++++++-------
 extensions/gggl-table-lies.c |  83 +++++++++---
 extensions/gggl-table.c      |  90 ++++++++++---
 extensions/gggl.c            | 250 ++++++++++++++++++++++++++++-------
 extensions/gimp-8bit.c       |  67 ++++++----
 extensions/grey.c            |   9 +-
 extensions/half.c            |  83 +++++++++---
 extensions/simple.c          | 120 +++++++++++++----
 extensions/sse-half.c        |  40 ++++--
 extensions/sse2-float.c      |  50 +++++--
 extensions/sse2-int16.c      |  10 +-
 extensions/sse2-int8.c       |  25 +++-
 extensions/sse4-int8.c       |  20 ++-
 extensions/two-table.c       |  21 ++-
 extensions/u16.c             |   6 +-
 extensions/u32.c             |  10 +-
 extensions/ycbcr.c           |  28 ++--
 26 files changed, 1359 insertions(+), 541 deletions(-)
---
diff --git a/extensions/CIE.c b/extensions/CIE.c
index 0cc2932..ed95256 100644
--- a/extensions/CIE.c
+++ b/extensions/CIE.c
@@ -186,42 +186,42 @@ static inline void  CHab_to_ab    (double  C,
                                    double *to_a,
                                    double *to_b);
 
-static inline void XYZ_to_LAB     (double X,
-                                   double Y,
-                                   double Z,
+static inline void XYZ_to_LAB     (double  X,
+                                   double  Y,
+                                   double  Z,
                                    double *to_L,
                                    double *to_a,
                                    double *to_b
                                    );
 
-static inline void LAB_to_XYZ     (double L,
-                                   double a,
-                                   double b,
+static inline void LAB_to_XYZ     (double  L,
+                                   double  a,
+                                   double  b,
                                    double *to_X,
                                    double *to_Y,
                                    double *to_Z
                                    );
 
-static inline void XYZ_to_xyY     (double X,
-                                   double Y,
-                                   double Z,
+static inline void XYZ_to_xyY     (double  X,
+                                   double  Y,
+                                   double  Z,
                                    double *to_x,
                                    double *to_y,
                                    double *to_Y
                                    );
 
-static inline void xyY_to_XYZ     (double x,
-                                   double y,
-                                   double Y,
+static inline void xyY_to_XYZ     (double  x,
+                                   double  y,
+                                   double  Y,
                                    double *to_X,
                                    double *to_Y,
                                    double *to_Z
                                    );
 
 static inline void
-XYZ_to_LAB (double X,
-            double Y,
-            double Z,
+XYZ_to_LAB (double  X,
+            double  Y,
+            double  Z,
             double *to_L,
             double *to_a,
             double *to_b)
@@ -240,9 +240,9 @@ XYZ_to_LAB (double X,
 }
 
 static inline void
-LAB_to_XYZ (double L,
-            double a,
-            double b,
+LAB_to_XYZ (double  L,
+            double  a,
+            double  b,
             double *to_X,
             double *to_Y,
             double *to_Z)
@@ -267,9 +267,9 @@ LAB_to_XYZ (double L,
 
 
 static inline void
-XYZ_to_xyY (double X,
-            double Y,
-            double Z,
+XYZ_to_xyY (double  X,
+            double  Y,
+            double  Z,
             double *to_x,
             double *to_y,
             double *to_Y)
@@ -289,9 +289,9 @@ XYZ_to_xyY (double X,
 }
 
 static inline void
-xyY_to_XYZ (double x,
-            double y,
-            double Y,
+xyY_to_XYZ (double  x,
+            double  y,
+            double  Y,
             double *to_X,
             double *to_Y,
             double *to_Z)
@@ -313,9 +313,10 @@ xyY_to_XYZ (double x,
 /* rgb <-> XYZ */
 
 static void
-rgba_to_xyz (const Babl *conversion,char *src,
-             char *dst,
-             long  n)
+rgba_to_xyz (const Babl *conversion,
+             char       *src,
+             char       *dst,
+             long        n)
 {
   const Babl *space = babl_conversion_get_source_space (conversion);
   while (n--)
@@ -331,9 +332,10 @@ rgba_to_xyz (const Babl *conversion,char *src,
 }
 
 static void
-xyz_to_rgba (const Babl *conversion,char *src,
-             char *dst,
-             long  n)
+xyz_to_rgba (const Babl *conversion,
+             char       *src,
+             char       *dst,
+             long        n)
 {
   const Babl *space = babl_conversion_get_destination_space (conversion);
   while (n--)
@@ -381,9 +383,10 @@ xyza_to_rgba (const Babl *conversion,char *src,
 /* rgb -> xyY */
 
 static void
-rgba_to_xyY (const Babl *conversion,char *src,
-             char *dst,
-             long  n)
+rgba_to_xyY (const Babl *conversion,
+             char       *src,
+             char       *dst,
+             long        n)
 {
   const Babl *space = babl_conversion_get_source_space (conversion);
   while (n--)
@@ -585,9 +588,10 @@ rgbaf_to_xyYf (const Babl *conversion,
 /* xyY -> rgb */
 
 static void
-xyY_to_rgba (const Babl *conversion,char *src,
-             char *dst,
-             long  n)
+xyY_to_rgba (const Babl *conversion,
+             char       *src,
+             char       *dst,
+             long        n)
 {
   const Babl *space = babl_conversion_get_destination_space (conversion);
   while (n--)
@@ -815,9 +819,10 @@ xyYaf_to_rgbaf (const Babl *conversion,
 /* rgb <-> LAB */
 
 static void
-rgba_to_lab (const Babl *conversion,char *src,
-             char *dst,
-             long  n)
+rgba_to_lab (const Babl *conversion,
+             char       *src,
+             char       *dst,
+             long        n)
 {
   const Babl *space = babl_conversion_get_source_space (conversion);
   while (n--)
@@ -838,9 +843,10 @@ rgba_to_lab (const Babl *conversion,char *src,
 
 
 static void
-lab_to_rgba (const Babl *conversion,char *src,
-             char *dst,
-             long  n)
+lab_to_rgba (const Babl *conversion,
+             char       *src,
+             char       *dst,
+             long        n)
 {
   const Babl *space = babl_conversion_get_destination_space (conversion);
   while (n--)
@@ -875,9 +881,10 @@ lab_to_rgba (const Babl *conversion,char *src,
 }
 
 static void
-rgba_to_laba (const Babl *conversion,char *src,
-              char *dst,
-              long  n)
+rgba_to_laba (const Babl *conversion,
+              char       *src,
+              char       *dst,
+              long        n)
 {
   const Babl *space = babl_conversion_get_source_space (conversion);
   while (n--)
@@ -902,9 +909,10 @@ rgba_to_laba (const Babl *conversion,char *src,
 }
 
 static void
-laba_to_rgba (const Babl *conversion,char *src,
-              char *dst,
-              long  n)
+laba_to_rgba (const Babl *conversion,
+              char       *src,
+              char       *dst,
+              long        n)
 {
   const Babl *space = babl_conversion_get_destination_space (conversion);
   while (n--)
@@ -959,9 +967,10 @@ ab_to_CHab (double  a,
 }
 
 static void
-rgba_to_lchab (const Babl *conversion,char *src,
-               char *dst,
-               long  n)
+rgba_to_lchab (const Babl *conversion,
+               char       *src,
+               char       *dst,
+               long        n)
 {
   const Babl *space = babl_conversion_get_source_space (conversion);
 
@@ -989,9 +998,10 @@ rgba_to_lchab (const Babl *conversion,char *src,
 }
 
 static void
-lchab_to_rgba (const Babl *conversion,char *src,
-               char *dst,
-               long  n)
+lchab_to_rgba (const Babl *conversion,
+               char       *src,
+               char       *dst,
+               long        n)
 {
   const Babl *space = babl_conversion_get_source_space (conversion);
 
@@ -1022,9 +1032,10 @@ lchab_to_rgba (const Babl *conversion,char *src,
 }
 
 static void
-rgba_to_lchaba (const Babl *conversion,char *src,
-                char *dst,
-                long  n)
+rgba_to_lchaba (const Babl *conversion,
+                char       *src,
+                char       *dst,
+                long        n)
 {
   const Babl *space = babl_conversion_get_source_space (conversion);
 
@@ -1053,9 +1064,10 @@ rgba_to_lchaba (const Babl *conversion,char *src,
 }
 
 static void
-lchaba_to_rgba (const Babl *conversion,char *src,
-                char *dst,
-                long  n)
+lchaba_to_rgba (const Babl *conversion,
+                char       *src,
+                char       *dst,
+                long        n)
 {
   const Babl *space = babl_conversion_get_destination_space (conversion);
   while (n--)
@@ -1118,9 +1130,10 @@ cubef (float f)
 }
 
 static void
-Yf_to_Lf (const Babl *conversion,float *src,
-          float *dst,
-          long   samples)
+Yf_to_Lf (const Babl *conversion,
+          float      *src,
+          float      *dst,
+          long        samples)
 {
   long n = samples;
 
@@ -1137,9 +1150,10 @@ Yf_to_Lf (const Babl *conversion,float *src,
 }
 
 static void
-Yaf_to_Lf (const Babl *conversion,float *src,
-           float *dst,
-           long   samples)
+Yaf_to_Lf (const Babl *conversion,
+           float      *src,
+           float      *dst,
+           long        samples)
 {
   long n = samples;
 
@@ -1156,9 +1170,10 @@ Yaf_to_Lf (const Babl *conversion,float *src,
 }
 
 static void
-Yaf_to_Laf (const Babl *conversion,float *src,
-            float *dst,
-            long   samples)
+Yaf_to_Laf (const Babl *conversion,
+            float      *src,
+            float      *dst,
+            long        samples)
 {
   long n = samples;
 
@@ -1177,9 +1192,10 @@ Yaf_to_Laf (const Babl *conversion,float *src,
 }
 
 static void
-rgbf_to_Labf (const Babl *conversion,float *src,
-              float *dst,
-              long   samples)
+rgbf_to_Labf (const Babl *conversion,
+              float      *src,
+              float      *dst,
+              long        samples)
 {
   const Babl *space = babl_conversion_get_source_space (conversion);
   float m_0_0 = space->space.RGBtoXYZf[0] / D50_WHITE_REF_X;
@@ -1221,9 +1237,10 @@ rgbf_to_Labf (const Babl *conversion,float *src,
 }
 
 static void
-rgbaf_to_Lf (const Babl *conversion,float *src,
-             float *dst,
-             long   samples)
+rgbaf_to_Lf (const Babl *conversion,
+             float      *src,
+             float      *dst,
+             long        samples)
 {
   const Babl *space = babl_conversion_get_source_space (conversion);
   float m_1_0 = space->space.RGBtoXYZf[3] / D50_WHITE_REF_Y;
@@ -1248,9 +1265,10 @@ rgbaf_to_Lf (const Babl *conversion,float *src,
 }
 
 static void
-rgbaf_to_Labf (const Babl *conversion,float *src,
-               float *dst,
-               long   samples)
+rgbaf_to_Labf (const Babl *conversion,
+               float      *src,
+               float      *dst,
+               long        samples)
 {
   const Babl *space = babl_conversion_get_source_space (conversion);
   float m_0_0 = space->space.RGBtoXYZf[0] / D50_WHITE_REF_X;
@@ -1292,9 +1310,10 @@ rgbaf_to_Labf (const Babl *conversion,float *src,
 }
 
 static void
-rgbaf_to_Labaf (const Babl *conversion,float *src,
-                float *dst,
-                long   samples)
+rgbaf_to_Labaf (const Babl *conversion,
+                float      *src,
+                float      *dst,
+                long        samples)
 {
   const Babl *space = babl_conversion_get_source_space (conversion);
   float m_0_0 = space->space.RGBtoXYZf[0] / D50_WHITE_REF_X;
@@ -1338,9 +1357,10 @@ rgbaf_to_Labaf (const Babl *conversion,float *src,
 }
 
 static void
-Labf_to_Lf (const Babl *conversion,float *src,
-            float *dst,
-            long   samples)
+Labf_to_Lf (const Babl *conversion,
+            float      *src,
+            float      *dst,
+            long        samples)
 {
   long n = samples;
 
@@ -1354,9 +1374,10 @@ Labf_to_Lf (const Babl *conversion,float *src,
 }
 
 static void
-Labaf_to_Lf (const Babl *conversion,float *src,
-             float *dst,
-             long   samples)
+Labaf_to_Lf (const Babl *conversion,
+             float      *src,
+             float      *dst,
+             long        samples)
 {
   long n = samples;
 
@@ -1370,9 +1391,10 @@ Labaf_to_Lf (const Babl *conversion,float *src,
 }
 
 static void
-Labf_to_rgbf (const Babl *conversion,float *src,
-                float *dst,
-                long   samples)
+Labf_to_rgbf (const Babl *conversion,
+              float      *src,
+              float      *dst,
+              long        samples)
 {
   const Babl *space = babl_conversion_get_source_space (conversion);
   float m_0_0 = space->space.XYZtoRGBf[0] * D50_WHITE_REF_X;
@@ -1460,9 +1482,10 @@ Labf_to_rgbaf (const Babl *conversion,float *src,
 }
 
 static void
-Labaf_to_rgbaf (const Babl *conversion,float *src,
-                float *dst,
-                long   samples)
+Labaf_to_rgbaf (const Babl *conversion,
+                float      *src,
+                float      *dst,
+                long        samples)
 {
   const Babl *space = babl_conversion_get_source_space (conversion);
   float m_0_0 = space->space.XYZtoRGBf[0] * D50_WHITE_REF_X;
@@ -1506,9 +1529,10 @@ Labaf_to_rgbaf (const Babl *conversion,float *src,
 }
 
 static void
-Labf_to_Lchabf (const Babl *conversion,float *src,
-                float *dst,
-                long   samples)
+Labf_to_Lchabf (const Babl *conversion,
+                float      *src,
+                float      *dst,
+                long        samples)
 {
   long n = samples;
 
@@ -1535,9 +1559,10 @@ Labf_to_Lchabf (const Babl *conversion,float *src,
 }
 
 static void
-Lchabf_to_Labf (const Babl *conversion,float *src,
-                float *dst,
-                long   samples)
+Lchabf_to_Labf (const Babl *conversion,
+                float      *src,
+                float      *dst,
+                long        samples)
 {
   long n = samples;
 
@@ -1560,9 +1585,10 @@ Lchabf_to_Labf (const Babl *conversion,float *src,
 }
 
 static void
-Labaf_to_Lchabaf (const Babl *conversion,float *src,
-                  float *dst,
-                  long   samples)
+Labaf_to_Lchabaf (const Babl *conversion,
+                  float      *src,
+                  float      *dst,
+                  long        samples)
 {
   long n = samples;
 
@@ -1591,9 +1617,10 @@ Labaf_to_Lchabaf (const Babl *conversion,float *src,
 }
 
 static void
-Lchabaf_to_Labaf (const Babl *conversion,float *src,
-                  float *dst,
-                  long   samples)
+Lchabaf_to_Labaf (const Babl *conversion,
+                  float      *src,
+                  float      *dst,
+                  long        samples)
 {
   long n = samples;
 
@@ -1704,7 +1731,10 @@ lab_r_to_f_sse2 (__m128 r)
 }
 
 static void
-Yf_to_Lf_sse2 (const Babl *conversion, const float *src, float *dst, long samples)
+Yf_to_Lf_sse2 (const Babl  *conversion, 
+               const float *src, 
+               float       *dst, 
+               long         samples)
 {
   long i = 0;
   long remainder;
@@ -1742,7 +1772,10 @@ Yf_to_Lf_sse2 (const Babl *conversion, const float *src, float *dst, long sample
 }
 
 static void
-Yaf_to_Lf_sse2 (const Babl *conversion, const float *src, float *dst, long samples)
+Yaf_to_Lf_sse2 (const Babl  *conversion, 
+                const float *src, 
+                float       *dst, 
+                long         samples)
 {
   long i = 0;
   long remainder;
@@ -1783,7 +1816,10 @@ Yaf_to_Lf_sse2 (const Babl *conversion, const float *src, float *dst, long sampl
 }
 
 static void
-rgbaf_to_Lf_sse2 (const Babl *conversion, const float *src, float *dst, long samples)
+rgbaf_to_Lf_sse2 (const Babl  *conversion, 
+                  const float *src, 
+                  float       *dst, 
+                  long         samples)
 {
   const Babl *space = babl_conversion_get_source_space (conversion);
   const float m_1_0 = space->space.RGBtoXYZf[3] / D50_WHITE_REF_Y;
@@ -1846,7 +1882,10 @@ rgbaf_to_Lf_sse2 (const Babl *conversion, const float *src, float *dst, long sam
 }
 
 static void
-rgbaf_to_Labaf_sse2 (const Babl *conversion, const float *src, float *dst, long samples)
+rgbaf_to_Labaf_sse2 (const Babl  *conversion, 
+                     const float *src, 
+                     float       *dst, 
+                     long         samples)
 {
   const Babl *space = babl_conversion_get_source_space (conversion);
   const float m_0_0 = space->space.RGBtoXYZf[0] / D50_WHITE_REF_X;
@@ -2362,9 +2401,9 @@ formats (void)
 /******** begin  integer RGB/CIE color space conversions **************/
 
 static inline void
-convert_double_u8_scaled (const Babl *conversion,
-                          double          min_val,
-                          double          max_val,
+convert_double_u8_scaled (const Babl   *conversion,
+                          double        min_val,
+                          double        max_val,
                           unsigned char min,
                           unsigned char max,
                           char         *src,
@@ -2392,7 +2431,7 @@ convert_double_u8_scaled (const Babl *conversion,
 }
 
 static inline void
-convert_u8_double_scaled (const Babl *conversion,
+convert_u8_double_scaled (const Babl   *conversion,
                           double        min_val,
                           double        max_val,
                           unsigned char min,
@@ -2452,16 +2491,16 @@ MAKE_CONVERSIONS (u8_ab, -128.0, 127.0, 0x00, 0xff)
 #undef MAKE_CONVERSIONS
 
 static inline void
-convert_float_u8_scaled (const Babl *conversion,
+convert_float_u8_scaled (const Babl     *conversion,
                           float          min_val,
                           float          max_val,
-                          unsigned char min,
-                          unsigned char max,
-                          char         *src,
-                          char         *dst,
-                          int           src_pitch,
-                          int           dst_pitch,
-                          long          n)
+                          unsigned char  min,
+                          unsigned char  max,
+                          char          *src,
+                          char          *dst,
+                          int            src_pitch,
+                          int            dst_pitch,
+                          long           n)
 {
   while (n--)
     {
@@ -2482,9 +2521,9 @@ convert_float_u8_scaled (const Babl *conversion,
 }
 
 static inline void
-convert_u8_float_scaled (const Babl *conversion,
-                          float        min_val,
-                          float        max_val,
+convert_u8_float_scaled (const Babl    *conversion,
+                          float         min_val,
+                          float         max_val,
                           unsigned char min,
                           unsigned char max,
                           char         *src,
@@ -2618,7 +2657,7 @@ types_u8 (void)
 }
 
 static inline void
-convert_double_u16_scaled (const Babl *conversion,
+convert_double_u16_scaled (const Babl    *conversion,
                            double         min_val,
                            double         max_val,
                            unsigned short min,
@@ -2648,7 +2687,7 @@ convert_double_u16_scaled (const Babl *conversion,
 }
 
 static inline void
-convert_u16_double_scaled (const Babl *conversion,
+convert_u16_double_scaled (const Babl    *conversion,
                            double         min_val,
                            double         max_val,
                            unsigned short min,
@@ -2706,9 +2745,9 @@ MAKE_CONVERSIONS (u16_ab, -128.0, 127.0, 0x00, 0xffff)
 
 
 static inline void
-convert_float_u16_scaled (const Babl *conversion,
-                           float         min_val,
-                           float         max_val,
+convert_float_u16_scaled (const Babl     *conversion,
+                           float          min_val,
+                           float          max_val,
                            unsigned short min,
                            unsigned short max,
                            char          *src,
@@ -2736,9 +2775,9 @@ convert_float_u16_scaled (const Babl *conversion,
 }
 
 static inline void
-convert_u16_float_scaled (const Babl *conversion,
-                           float         min_val,
-                           float         max_val,
+convert_u16_float_scaled (const Babl     *conversion,
+                           float          min_val,
+                           float          max_val,
                            unsigned short min,
                            unsigned short max,
                            char          *src,
diff --git a/extensions/HCY.c b/extensions/HCY.c
index 96063e2..b3cea36 100644
--- a/extensions/HCY.c
+++ b/extensions/HCY.c
@@ -35,27 +35,33 @@
 #define RGB_LUMA_BLUE 0.114 //0.0722
 #define EPSILON 1e-10
 
-static void rgba_to_hcya     (const Babl *conversion,char *src,
-                              char *dst,
-                              long  samples);
-
-static void hcya_to_rgba     (const Babl *conversion,char *src,
-                              char *dst,
-                              long  samples);
-
-static void rgba_to_hcy      (const Babl *conversion,char *src,
-                              char *dst,
-                              long  samples);
-
-static void hcy_to_rgba      (const Babl *conversion,char *src,
-                              char *dst,
-                              long  samples);
-
-static void rgba_to_hcy_step (char *src,
-                              char *dst);
+static void rgba_to_hcya     (const Babl *conversion,
+                              char       *src,
+                              char       *dst,
+                              long        samples);
+
+static void hcya_to_rgba     (const Babl *conversion,
+                              char       *src,
+                              char       *dst,
+                              long        samples);
+
+static void rgba_to_hcy      (const Babl *conversion,
+                              char       *src,
+                              char       *dst,
+                              long        samples);
+
+static void hcy_to_rgba      (const Babl *conversion,
+                              char       *src,
+                              char       *dst,
+                              long        samples);
+
+static void 
+rgba_to_hcy_step (char *src,
+                  char *dst);
 
-static void hcy_to_rgba_step (char *src,
-                              char *dst);
+static void 
+hcy_to_rgba_step (char *src,
+                  char *dst);
 
 static void components       (void);
 static void models           (void);
@@ -288,9 +294,10 @@ hcy_to_rgba_step (char *src,
 }
 
 static void
-rgba_to_hcya (const Babl *conversion,char *src,
-              char *dst,
-              long  samples)
+rgba_to_hcya (const Babl *conversion,
+              char       *src,
+              char       *dst,
+              long        samples)
 {
   long n = samples;
 
@@ -328,9 +335,10 @@ hcya_to_rgba (const Babl *conversion,char *src,
 }
 
 static void
-rgba_to_hcy (const Babl *conversion,char *src,
-             char *dst,
-             long  samples)
+rgba_to_hcy (const Babl *conversion,
+             char       *src,
+             char       *dst,
+             long        samples)
 {
   long n = samples;
 
@@ -344,9 +352,10 @@ rgba_to_hcy (const Babl *conversion,char *src,
 }
 
 static void
-hcy_to_rgba (const Babl *conversion,char *src,
-             char *dst,
-             long  samples)
+hcy_to_rgba (const Babl *conversion,
+             char       *src,
+             char       *dst,
+             long        samples)
 {
   long n = samples;
 
diff --git a/extensions/HSL.c b/extensions/HSL.c
index 20cb8b2..2650a14 100644
--- a/extensions/HSL.c
+++ b/extensions/HSL.c
@@ -27,25 +27,40 @@
 #define MAX(a,b) ((a < b) ? b : a)
 #define EPSILON  1.0e-10
 
-static void  rgba_to_hsla     (const Babl *conversion,char   *src,
-                               char   *dst,
-                               long    samples);
-static void  hsla_to_rgba     (const Babl *conversion,char   *src,
-                               char   *dst,
-                               long    samples);
-static void  rgba_to_hsl      (const Babl *conversion,char   *src,
-                               char   *dst,
-                               long    samples);
-static void  hsl_to_rgba      (const Babl *conversion,char   *src,
-                               char   *dst,
-                               long    samples);
-static void  rgb_to_hsl_step  (double *src,
-                               double *dst);
-static void  hsl_to_rgb_step  (double *src,
-                               double *dst);
-static inline double hue2cpn  (double  p,
-                               double  q,
-                               double  hue);
+static void  
+rgba_to_hsla     (const Babl *conversion,
+                  char       *src,
+                  char       *dst,
+                  long        samples);
+static void  
+hsla_to_rgba     (const Babl *conversion,
+                  char       *src,
+                  char       *dst,
+                  long        samples);
+static void  
+rgba_to_hsl      (const Babl *conversion,
+                  char       *src,
+                  char       *dst,
+                  long        samples);
+static void  
+hsl_to_rgba      (const Babl *conversion,
+                  char       *src,
+                  char       *dst,
+                  long        samples);
+                  
+static void  
+rgb_to_hsl_step  (double *src,
+                  double *dst);
+                               
+static void  
+hsl_to_rgb_step  (double *src,
+                  double *dst);
+                               
+static inline double 
+hue2cpn  (double  p,
+          double  q,
+          double  hue);
+          
 int init (void);
 
 
@@ -159,9 +174,10 @@ rgb_to_hsl_step (double* src,
 
 
 static void
-rgba_to_hsla (const Babl *conversion,char *src,
-              char *dst,
-              long  samples)
+rgba_to_hsla (const Babl *conversion,
+              char       *src,
+              char       *dst,
+              long        samples)
 {
   long n = samples;
 
@@ -180,9 +196,10 @@ rgba_to_hsla (const Babl *conversion,char *src,
 
 
 static void
-rgba_to_hsl (const Babl *conversion,char *src,
-             char *dst,
-             long  samples)
+rgba_to_hsl (const Babl *conversion,
+             char       *src,
+             char       *dst,
+             long        samples)
 {
   long n = samples;
 
@@ -197,7 +214,9 @@ rgba_to_hsl (const Babl *conversion,char *src,
 
 
 static inline double
-hue2cpn (double p, double q, double hue)
+hue2cpn (double p,
+         double q, 
+         double hue)
 {
   if (hue < 0.0) hue += 1.0;
   if (hue > 1.0) hue -= 1.0;
@@ -242,9 +261,10 @@ hsl_to_rgb_step (double *src,
 
 
 static void
-hsla_to_rgba (const Babl *conversion,char *src,
-              char *dst,
-              long  samples)
+hsla_to_rgba (const Babl *conversion,
+              char       *src,
+              char       *dst,
+              long        samples)
 {
   long n = samples;
 
@@ -263,9 +283,10 @@ hsla_to_rgba (const Babl *conversion,char *src,
 
 
 static void
-hsl_to_rgba (const Babl *conversion,char *src,
-             char *dst,
-             long  samples)
+hsl_to_rgba (const Babl *conversion,
+             char       *src,
+             char       *dst,
+             long        samples)
 {
   long n = samples;
 
diff --git a/extensions/HSV.c b/extensions/HSV.c
index f0492c2..9446b15 100644
--- a/extensions/HSV.c
+++ b/extensions/HSV.c
@@ -32,27 +32,37 @@
 #define MAX(a,b) (a < b) ? b : a;
 #define EPSILON  1.0e-10
 
-static void rgba_to_hsva     (const Babl *conversion,char *src,
-                              char *dst,
-                              long  samples);
-
-static void hsva_to_rgba     (const Babl *conversion,char *src,
-                              char *dst,
-                              long  samples);
-
-static void rgba_to_hsv      (const Babl *conversion,char *src,
-                              char *dst,
-                              long  samples);
-
-static void hsv_to_rgba      (const Babl *conversion,char *src,
-                              char *dst,
-                              long  samples);
-
-static void rgba_to_hsv_step (char *src,
-                              char *dst);
+static void 
+rgba_to_hsva     (const Babl *conversion,
+                  char       *src,
+                  char       *dst,
+                  long        samples);
+
+static void 
+hsva_to_rgba     (const Babl *conversion,
+                  char       *src,
+                  char       *dst,
+                  long        samples);
+
+static void 
+rgba_to_hsv      (const Babl *conversion,
+                  char       *src,
+                  char       *dst,
+                  long        samples);
+
+static void 
+hsv_to_rgba      (const Babl *conversion,
+                  char       *src,
+                  char       *dst,
+                  long        samples);
+
+static void 
+rgba_to_hsv_step (char *src,
+                  char *dst);
 
-static void hsv_to_rgba_step (char *src,
-                              char *dst);
+static void 
+hsv_to_rgba_step (char *src,
+                  char *dst);
 
 static void components       (void);
 static void models           (void);
@@ -276,9 +286,10 @@ hsv_to_rgba_step (char *src,
 }
 
 static void
-rgba_to_hsva (const Babl *conversion,char *src,
-              char *dst,
-              long  samples)
+rgba_to_hsva (const Babl *conversion,
+              char       *src,
+              char       *dst,
+              long        samples)
 {
   long n = samples;
 
@@ -296,9 +307,10 @@ rgba_to_hsva (const Babl *conversion,char *src,
 }
 
 static void
-hsva_to_rgba (const Babl *conversion,char *src,
-              char *dst,
-              long  samples)
+hsva_to_rgba (const Babl *conversion,
+              char       *src,
+              char       *dst,
+              long        samples)
 {
   long n = samples;
 
@@ -316,9 +328,10 @@ hsva_to_rgba (const Babl *conversion,char *src,
 }
 
 static void
-rgba_to_hsv (const Babl *conversion,char *src,
-             char *dst,
-             long  samples)
+rgba_to_hsv (const Babl *conversion,
+             char       *src,
+             char       *dst,
+             long        samples)
 {
   long n = samples;
 
@@ -332,9 +345,10 @@ rgba_to_hsv (const Babl *conversion,char *src,
 }
 
 static void
-hsv_to_rgba (const Babl *conversion,char *src,
-             char *dst,
-             long  samples)
+hsv_to_rgba (const Babl *conversion,
+             char       *src,
+             char       *dst,
+             long        samples)
 {
   long n = samples;
 
diff --git a/extensions/cairo.c b/extensions/cairo.c
index bca8bf4..580782d 100644
--- a/extensions/cairo.c
+++ b/extensions/cairo.c
@@ -27,7 +27,10 @@
 int init (void);
 
 static void
-conv_rgba8_cairo24_le (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_rgba8_cairo24_le (const Babl    *conversion,
+                       unsigned char *src, 
+                       unsigned char *dst, 
+                       long           samples)
 {
   long n = samples;
   uint32_t *srci = (void *)src;
@@ -45,7 +48,10 @@ conv_rgba8_cairo24_le (const Babl *conversion,unsigned char *src, unsigned char
 }
 
 static void
-conv_rgb8_cairo24_le (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_rgb8_cairo24_le (const Babl    *conversion,
+                      unsigned char *src, 
+                      unsigned char *dst, 
+                      long           samples)
 {
   long n = samples;
   while (n--)
@@ -64,7 +70,10 @@ conv_rgb8_cairo24_le (const Babl *conversion,unsigned char *src, unsigned char *
 
 #if 0
 static void
-conv_rgbA8_premul_cairo32_le (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_rgbA8_premul_cairo32_le (const Babl    *conversion,
+                              unsigned char *src, 
+                              unsigned char *dst, 
+                              long           samples)
 {
   long n = samples;
   while (n--)
@@ -83,7 +92,10 @@ conv_rgbA8_premul_cairo32_le (const Babl *conversion,unsigned char *src, unsigne
 #else
 
 static void
-conv_rgbA8_premul_cairo32_le (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_rgbA8_premul_cairo32_le (const Babl    *conversion,
+                              unsigned char *src, 
+                              unsigned char *dst, 
+                              long           samples)
 {
   long n = samples;
   uint32_t *srci = (void *)src;
@@ -101,7 +113,11 @@ conv_rgbA8_premul_cairo32_le (const Babl *conversion,unsigned char *src, unsigne
 }
 #endif
 
-static void conv_cairo32_rgbA8_premul_le (const Babl *conversion,unsigned char *src, unsigned char *dst, 
long samples)
+static void 
+conv_cairo32_rgbA8_premul_le (const Babl    *conversion,
+                              unsigned char *src, 
+                              unsigned char *dst, 
+                              long           samples)
 {
   long n = samples;
   while (n--)
@@ -118,7 +134,11 @@ static void conv_cairo32_rgbA8_premul_le (const Babl *conversion,unsigned char *
     }
 }
 
-static void conv_cairo32_rgba8_le (const Babl *conversion,unsigned char *src, unsigned char *dst, long 
samples)
+static void 
+conv_cairo32_rgba8_le (const Babl    *conversion,
+                       unsigned char *src, 
+                       unsigned char *dst, 
+                       long           samples)
 {
   long n = samples;
   while (n--)
@@ -162,7 +182,11 @@ static void conv_cairo32_rgba8_le (const Babl *conversion,unsigned char *src, un
 }
 
 
-static void conv_cairo32_rgbAF_premul_le (const Babl *conversion,unsigned char *src, unsigned char 
*dst_char, long samples)
+static void 
+conv_cairo32_rgbAF_premul_le (const Babl    *conversion,
+                              unsigned char *src, 
+                              unsigned char *dst_char, 
+                              long           samples)
 {
   long n = samples;
   float *dst = (void*)dst_char;
@@ -181,7 +205,10 @@ static void conv_cairo32_rgbAF_premul_le (const Babl *conversion,unsigned char *
 }
 
 static void
-conv_rgba8_cairo32_le (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_rgba8_cairo32_le (const Babl    *conversion,
+                       unsigned char *src, 
+                       unsigned char *dst, 
+                       long           samples)
 {
   long n = samples;
   uint32_t *dsti = (void*) dst;
@@ -220,7 +247,10 @@ conv_rgba8_cairo32_le (const Babl *conversion,unsigned char *src, unsigned char
 }
 
 static void
-conv_rgb8_cairo32_le (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_rgb8_cairo32_le (const Babl    *conversion,
+                      unsigned char *src, 
+                      unsigned char *dst, 
+                      long           samples)
 {
   long n = samples;
   while (n--)
@@ -240,7 +270,10 @@ conv_rgb8_cairo32_le (const Babl *conversion,unsigned char *src, unsigned char *
 
 
 static void
-conv_yA8_cairo32_le (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_yA8_cairo32_le (const Babl    *conversion,
+                     unsigned char *src, 
+                     unsigned char *dst, 
+                     long           samples)
 {
   long n = samples;
   while (n--)
@@ -261,7 +294,10 @@ conv_yA8_cairo32_le (const Babl *conversion,unsigned char *src, unsigned char *d
 }
 
 static void
-conv_yA16_cairo32_le (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_yA16_cairo32_le (const Babl    *conversion,
+                      unsigned char *src, 
+                      unsigned char *dst, 
+                      long           samples)
 {
   long n = samples;
   uint16_t *ssrc = (void*) src;
@@ -278,7 +314,10 @@ conv_yA16_cairo32_le (const Babl *conversion,unsigned char *src, unsigned char *
 }
 
 static void
-conv_y8_cairo32_le (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_y8_cairo32_le (const Babl    *conversion,
+                    unsigned char *src, 
+                    unsigned char *dst, 
+                    long           samples)
 {
   long n = samples;
   while (n--)
@@ -292,7 +331,10 @@ conv_y8_cairo32_le (const Babl *conversion,unsigned char *src, unsigned char *ds
 }
 
 static void
-conv_y16_cairo32_le (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_y16_cairo32_le (const Babl    *conversion,
+                     unsigned char *src, 
+                     unsigned char *dst, 
+                     long           samples)
 {
   long n = samples;
   uint16_t *s16 = (void*)src;
@@ -310,7 +352,8 @@ conv_y16_cairo32_le (const Babl *conversion,unsigned char *src, unsigned char *d
 }
 
 static void
-conv_rgbA_gamma_float_cairo32_le (const Babl *conversion,unsigned char *src,
+conv_rgbA_gamma_float_cairo32_le (const Babl    *conversion,
+                                  unsigned char *src,
                                   unsigned char *dst,
                                   long           samples)
 {
@@ -382,7 +425,8 @@ conv_rgbafloat_cairo32_le (const Babl    *conversion,
 
 
 static void
-conv_yafloat_cairo32_le (const Babl *conversion,unsigned char *src,
+conv_yafloat_cairo32_le (const Babl    *conversion,
+                         unsigned char *src,
                          unsigned char *dst,
                          long           samples)
 {
diff --git a/extensions/double.c b/extensions/double.c
index 502a466..07f533b 100644
--- a/extensions/double.c
+++ b/extensions/double.c
@@ -28,7 +28,8 @@
 
 
 static void
-conv_rgbaD_linear_rgbAD_gamma (const Babl *conversion,unsigned char *src,
+conv_rgbaD_linear_rgbAD_gamma (const Babl    *conversion,
+                               unsigned char *src,
                                unsigned char *dst,
                                long           samples)
 {
@@ -93,7 +94,8 @@ conv_rgbAD_linear_rgbAD_gamma (const Babl    *conversion,
 }
 
 static void
-conv_rgbaD_linear_rgbaD_gamma (const Babl *conversion,unsigned char *src, 
+conv_rgbaD_linear_rgbaD_gamma (const Babl    *conversion,
+                               unsigned char *src, 
                                unsigned char *dst, 
                                long           samples)
 {
@@ -116,7 +118,8 @@ conv_rgbaD_linear_rgbaD_gamma (const Babl *conversion,unsigned char *src,
 #define conv_rgbaD_linear_rgbD_linear conv_rgbaD_gamma_rgbD_gamma
 
 static void
-conv_rgbaD_linear_rgbD_linear (const Babl *conversion,unsigned char *src,
+conv_rgbaD_linear_rgbD_linear (const Babl    *conversion,
+                               unsigned char *src,
                                unsigned char *dst,
                                long           samples)
 {
@@ -135,7 +138,8 @@ conv_rgbaD_linear_rgbD_linear (const Babl *conversion,unsigned char *src,
 
 
 static void
-conv_rgbD_linear_rgbD_gamma (const Babl *conversion,unsigned char *src, 
+conv_rgbD_linear_rgbD_gamma (const Babl    *conversion,
+                             unsigned char *src, 
                              unsigned char *dst, 
                              long           samples)
 {
@@ -155,7 +159,8 @@ conv_rgbD_linear_rgbD_gamma (const Babl *conversion,unsigned char *src,
 
 
 static void
-conv_rgbaD_gamma_rgbaD_linear (const Babl *conversion,unsigned char *src, 
+conv_rgbaD_gamma_rgbaD_linear (const Babl    *conversion,
+                               unsigned char *src, 
                                unsigned char *dst, 
                                long           samples)
 {
@@ -175,7 +180,8 @@ conv_rgbaD_gamma_rgbaD_linear (const Babl *conversion,unsigned char *src,
 }
 
 static void
-conv_rgbD_gamma_rgbD_linear (const Babl *conversion,unsigned char *src, 
+conv_rgbD_gamma_rgbD_linear (const Babl    *conversion,
+                             unsigned char *src, 
                              unsigned char *dst, 
                              long           samples)
 {
@@ -195,7 +201,8 @@ conv_rgbD_gamma_rgbD_linear (const Babl *conversion,unsigned char *src,
 
 
 static void
-conv_rgbD_linear_rgbaD_linear (const Babl *conversion,unsigned char *src, 
+conv_rgbD_linear_rgbaD_linear (const Babl    *conversion,
+                               unsigned char *src, 
                                unsigned char *dst, 
                                long           samples)
 {
diff --git a/extensions/fast-float.c b/extensions/fast-float.c
index 5540185..965a9eb 100644
--- a/extensions/fast-float.c
+++ b/extensions/fast-float.c
@@ -36,19 +36,19 @@ typedef struct BablLookup
 {
   BablLookupFunction function;
   void              *data;
-  int               shift;
-  uint32_t          positive_min, positive_max, negative_min, negative_max;
-  uint32_t          bitmask[babl_LOOKUP_MAX_ENTRIES/32];
-  int               entries;
-  float             table[];
+  int                shift;
+  uint32_t           positive_min, positive_max, negative_min, negative_max;
+  uint32_t           bitmask[babl_LOOKUP_MAX_ENTRIES/32];
+  int                entries;
+  float              table[];
 } BablLookup;
 
 
-static BablLookup *babl_lookup_new (BablLookupFunction  function,
-                                    void *              data,
-                                    float               start,
-                                    float               end,
-                                    float               precision);
+static BablLookup *babl_lookup_new (BablLookupFunction function,
+                                    void *             data,
+                                    float              start,
+                                    float              end,
+                                    float              precision);
 #if 0
 static void        babl_lookup_free      (BablLookup         *lookup);
 #endif
@@ -286,7 +286,8 @@ babl_lookup_free (BablLookup *lookup)
 #endif
 
 static void
-conv_rgbaF_linear_rgbAF_gamma (const Babl *conversion,unsigned char *src, 
+conv_rgbaF_linear_rgbAF_gamma (const Babl    *conversion,
+                               unsigned char *src, 
                                unsigned char *dst, 
                                long           samples)
 {
@@ -327,7 +328,8 @@ conv_rgbaF_linear_rgbAF_gamma (const Babl *conversion,unsigned char *src,
 
 
 static void
-conv_rgbaF_linear_rgba8_gamma (const Babl *conversion,unsigned char *src, 
+conv_rgbaF_linear_rgba8_gamma (const Babl    *conversion,
+                               unsigned char *src, 
                                unsigned char *dst, 
                                long           samples)
 {
@@ -363,7 +365,8 @@ conv_rgbaF_linear_rgba8_gamma (const Babl *conversion,unsigned char *src,
 }
 
 static void
-conv_rgbaF_linear_rgbA8_gamma (const Babl *conversion,unsigned char *src, 
+conv_rgbaF_linear_rgbA8_gamma (const Babl    *conversion,
+                               unsigned char *src, 
                                unsigned char *dst, 
                                long           samples)
 {
@@ -481,7 +484,8 @@ conv_rgbaF_linear_rgbA8_gamma_cairo (const Babl *conversion,unsigned char *src,
 }
 
 static void
-conv_rgbAF_linear_rgbAF_gamma (const Babl *conversion,unsigned char *src, 
+conv_rgbAF_linear_rgbAF_gamma (const Babl    *conversion,
+                               unsigned char *src, 
                                unsigned char *dst, 
                                long           samples)
 {
@@ -515,7 +519,8 @@ conv_rgbAF_linear_rgbAF_gamma (const Babl *conversion,unsigned char *src,
 }
 
 static void
-conv_rgbaF_linear_rgbaF_gamma (const Babl *conversion,unsigned char *src, 
+conv_rgbaF_linear_rgbaF_gamma (const Babl    *conversion,
+                               unsigned char *src, 
                                unsigned char *dst, 
                                long           samples)
 {
@@ -551,7 +556,8 @@ conv_rgbF_linear_rgbF_gamma (const Babl *conversion,unsigned char *src,
 
 
 static void
-conv_rgbaF_gamma_rgbaF_linear (const Babl *conversion,unsigned char *src, 
+conv_rgbaF_gamma_rgbaF_linear (const Babl    *conversion,
+                               unsigned char *src, 
                                unsigned char *dst, 
                                long           samples)
 {
@@ -569,7 +575,8 @@ conv_rgbaF_gamma_rgbaF_linear (const Babl *conversion,unsigned char *src,
 }
 
 static void
-conv_rgbF_gamma_rgbF_linear (const Babl *conversion,unsigned char *src, 
+conv_rgbF_gamma_rgbF_linear (const Babl    *conversion,
+                             unsigned char *src, 
                              unsigned char *dst, 
                              long           samples)
 {
diff --git a/extensions/float.c b/extensions/float.c
index eaa38f5..f688e66 100644
--- a/extensions/float.c
+++ b/extensions/float.c
@@ -29,9 +29,10 @@
 static const Babl *trc_srgb = NULL;
 
 static void
-conv_rgbaF_linear_rgbAF_nonlinear (const Babl *conversion,unsigned char *src,
-                               unsigned char *dst,
-                               long           samples)
+conv_rgbaF_linear_rgbAF_nonlinear (const Babl    *conversion,
+                                   unsigned char *src,
+                                   unsigned char *dst,
+                                   long           samples)
 {
    const Babl  *space = babl_conversion_get_destination_space (conversion);
    const Babl **trc   = (void*)space->space.trc;
@@ -59,7 +60,8 @@ conv_rgbaF_linear_rgbAF_nonlinear (const Babl *conversion,unsigned char *src,
 }
 
 static void
-conv_rgbaF_linear_rgbAF_perceptual (const Babl *conversion,unsigned char *src,
+conv_rgbaF_linear_rgbAF_perceptual (const Babl    *conversion,
+                                    unsigned char *src,
                                     unsigned char *dst,
                                     long           samples)
 {
@@ -156,7 +158,8 @@ conv_rgbAF_linear_rgbAF_perceptual (const Babl    *conversion,
 
 
 static void
-conv_rgbaF_linear_rgbaF_nonlinear (const Babl *conversion,unsigned char *src, 
+conv_rgbaF_linear_rgbaF_nonlinear (const Babl    *conversion,
+                                   unsigned char *src, 
                                    unsigned char *dst, 
                                    long           samples)
 {
@@ -177,7 +180,8 @@ conv_rgbaF_linear_rgbaF_nonlinear (const Babl *conversion,unsigned char *src,
 }
 
 static void
-conv_rgbaF_linear_rgbaF_perceptual (const Babl *conversion,unsigned char *src, 
+conv_rgbaF_linear_rgbaF_perceptual (const Babl    *conversion,
+                                    unsigned char *src, 
                                     unsigned char *dst, 
                                     long           samples)
 {
@@ -196,7 +200,8 @@ conv_rgbaF_linear_rgbaF_perceptual (const Babl *conversion,unsigned char *src,
 
 
 static void
-conv_rgbF_linear_rgbF_nonlinear (const Babl *conversion,unsigned char *src,
+conv_rgbF_linear_rgbF_nonlinear (const Babl    *conversion,
+                                 unsigned char *src,
                                  unsigned char *dst,
                                  long           samples)
 {
@@ -215,7 +220,8 @@ conv_rgbF_linear_rgbF_nonlinear (const Babl *conversion,unsigned char *src,
 }
 
 static void
-conv_rgbF_linear_rgbF_perceptual (const Babl *conversion,unsigned char *src,
+conv_rgbF_linear_rgbF_perceptual (const Babl    *conversion,
+                                  unsigned char *src,
                                   unsigned char *dst,
                                   long           samples)
 {
@@ -233,7 +239,8 @@ conv_rgbF_linear_rgbF_perceptual (const Babl *conversion,unsigned char *src,
 
 
 static void
-conv_rgbaF_nonlinear_rgbaF_linear (const Babl *conversion,unsigned char *src,
+conv_rgbaF_nonlinear_rgbaF_linear (const Babl    *conversion,
+                                   unsigned char *src,
                                    unsigned char *dst,
                                    long           samples)
 {
@@ -253,7 +260,8 @@ conv_rgbaF_nonlinear_rgbaF_linear (const Babl *conversion,unsigned char *src,
 }
 
 static void
-conv_rgbaF_perceptual_rgbaF_linear (const Babl *conversion,unsigned char *src,
+conv_rgbaF_perceptual_rgbaF_linear (const Babl    *conversion,
+                                    unsigned char *src,
                                     unsigned char *dst,
                                     long           samples)
 {
@@ -272,7 +280,8 @@ conv_rgbaF_perceptual_rgbaF_linear (const Babl *conversion,unsigned char *src,
 
 
 static void
-conv_rgbF_nonlinear_rgbF_linear (const Babl *conversion,unsigned char *src,
+conv_rgbF_nonlinear_rgbF_linear (const Babl    *conversion,
+                                 unsigned char *src,
                                  unsigned char *dst,
                                  long           samples)
 {
@@ -291,7 +300,8 @@ conv_rgbF_nonlinear_rgbF_linear (const Babl *conversion,unsigned char *src,
 }
 
 static void
-conv_rgbF_perceptual_rgbF_linear (const Babl *conversion,unsigned char *src,
+conv_rgbF_perceptual_rgbF_linear (const Babl    *conversion,
+                                  unsigned char *src,
                                   unsigned char *dst,
                                   long           samples)
 {
diff --git a/extensions/gegl-fixups.c b/extensions/gegl-fixups.c
index 70ef2d3..38a0cf5 100644
--- a/extensions/gegl-fixups.c
+++ b/extensions/gegl-fixups.c
@@ -144,7 +144,10 @@ gggl_float_to_index16 (float f)
 }
 
 static inline void
-conv_F_8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_F_8 (const Babl    *conversion,
+          unsigned char *src, 
+          unsigned char *dst, 
+          long           samples)
 {
   long n = samples;
 
@@ -161,7 +164,10 @@ conv_F_8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long sa
 
 
 static inline void
-conv_F_8g (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_F_8g (const Babl    *conversion,
+           unsigned char *src, 
+           unsigned char *dst, 
+           long           samples)
 {
   long n = samples;
 
@@ -178,7 +184,10 @@ conv_F_8g (const Babl *conversion,unsigned char *src, unsigned char *dst, long s
 
 
 static inline void __attribute__((unused))
-conv_8_F (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_8_F (const Babl    *conversion,
+          unsigned char *src, 
+          unsigned char *dst, 
+          long           samples)
 {
   long n = samples;
 
@@ -194,7 +203,10 @@ conv_8_F (const Babl *conversion,unsigned char *src, unsigned char *dst, long sa
 
 
 static void
-conv_rgbaF_rgb8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_rgbaF_rgb8 (const Babl    *conversion,
+                 unsigned char *src, 
+                 unsigned char *dst, 
+                 long           samples)
 {
   long n = samples;
 
@@ -221,7 +233,10 @@ conv_rgbaF_rgb8 (const Babl *conversion,unsigned char *src, unsigned char *dst,
 
 
 static void __attribute__((unused))
-conv_rgbaF_rgba8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_rgbaF_rgba8 (const Babl    *conversion,
+                  unsigned char *src, 
+                  unsigned char *dst, 
+                  long           samples)
 {
   long n = samples;
 
@@ -252,13 +267,19 @@ conv_rgbaF_rgba8 (const Babl *conversion,unsigned char *src, unsigned char *dst,
 #define conv_rgbaF_rgbP8    conv_rgbaF_rgba8
 
 static void __attribute__((unused))
-conv_rgbF_rgb8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_rgbF_rgb8 (const Babl    *conversion,
+                unsigned char *src, 
+                unsigned char *dst, 
+                long           samples)
 {
   conv_F_8g (conversion, src, dst, samples * 3);
 }
 
 static void __attribute__((unused))
-conv_gaF_ga8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_gaF_ga8 (const Babl    *conversion,
+              unsigned char *src, 
+              unsigned char *dst, 
+              long           samples)
 {
   conv_F_8 (conversion, src, dst, samples * 2);
 }
@@ -269,7 +290,10 @@ conv_gaF_ga8 (const Babl *conversion,unsigned char *src, unsigned char *dst, lon
 
 
 static void
-conv_rgba8_rgbaF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_rgba8_rgbaF (const Babl    *conversion,
+                  unsigned char *src, 
+                  unsigned char *dst, 
+                  long           samples)
 {
   long n = samples;
 
@@ -294,7 +318,10 @@ conv_rgba8_rgbaF (const Babl *conversion,unsigned char *src, unsigned char *dst,
 }
 
 static void
-conv_rgb8_rgbaF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_rgb8_rgbaF (const Babl    *conversion,
+                 unsigned char *src, 
+                 unsigned char *dst, 
+                 long           samples)
 {
   long n = samples;
 
@@ -318,7 +345,8 @@ conv_rgb8_rgbaF (const Babl *conversion,unsigned char *src, unsigned char *dst,
 }
 
 static void
-conv_rgbAF_rgb8 (const Babl *conversion,unsigned char *srcc,
+conv_rgbAF_rgb8 (const Babl    *conversion,
+                 unsigned char *srcc,
                  unsigned char *dstc,
                  long           samples)
 {
@@ -348,7 +376,8 @@ conv_rgbAF_rgb8 (const Babl *conversion,unsigned char *srcc,
 }
 
 static void
-conv_bgrA8_rgba8 (const Babl *conversion,unsigned char *srcc,
+conv_bgrA8_rgba8 (const Babl    *conversion,
+                  unsigned char *srcc,
                   unsigned char *dstc,
                   long           samples)
 {
@@ -369,7 +398,8 @@ conv_bgrA8_rgba8 (const Babl *conversion,unsigned char *srcc,
 }
 
 static void
-conv_rgbaF_rgbAF (const Babl *conversion,unsigned char *srcc,
+conv_rgbaF_rgbAF (const Babl    *conversion,
+                  unsigned char *srcc,
                   unsigned char *dstc,
                   long           samples)
 {
@@ -397,7 +427,8 @@ conv_rgbaF_rgbAF (const Babl *conversion,unsigned char *srcc,
 }
 
 static void
-conv_rgbAF_rgbaF (const Babl *conversion,unsigned char *srcc,
+conv_rgbAF_rgbaF (const Babl    *conversion,
+                  unsigned char *srcc,
                   unsigned char *dstc,
                   long           samples)
 {
@@ -427,7 +458,8 @@ conv_rgbAF_rgbaF (const Babl *conversion,unsigned char *srcc,
 
 
 static void
-conv_rgbAF_lrgba8 (const Babl *conversion,unsigned char *srcc,
+conv_rgbAF_lrgba8 (const Babl    *conversion,
+                   unsigned char *srcc,
                    unsigned char *dstc,
                    long           samples)
 {
@@ -458,7 +490,10 @@ conv_rgbAF_lrgba8 (const Babl *conversion,unsigned char *srcc,
 }
 
 static void
-conv_rgba8_rgb8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_rgba8_rgb8 (const Babl    *conversion,
+                 unsigned char *src, 
+                 unsigned char *dst, 
+                 long           samples)
 {
   long n = samples - 1;
 
diff --git a/extensions/gggl-lies.c b/extensions/gggl-lies.c
index 3f33305..09c4a90 100644
--- a/extensions/gggl-lies.c
+++ b/extensions/gggl-lies.c
@@ -49,7 +49,10 @@
  */
 
 static void
-conv_F_8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_F_8 (const Babl    *conversion,
+          unsigned char *src, 
+          unsigned char *dst, 
+          long           samples)
 {
   long n = samples;
 
@@ -74,7 +77,10 @@ conv_F_8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long sa
 }
 
 static void
-conv_F_16 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_F_16 (const Babl    *conversion,
+           unsigned char *src, 
+           unsigned char *dst, 
+           long           samples)
 {
   long n = samples;
 
@@ -101,7 +107,10 @@ conv_F_16 (const Babl *conversion,unsigned char *src, unsigned char *dst, long s
 
 
 static void
-conv_8_F (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_8_F (const Babl    *conversion,
+          unsigned char *src, 
+          unsigned char *dst, 
+          long           samples)
 {
   long n = samples;
 
@@ -114,7 +123,10 @@ conv_8_F (const Babl *conversion,unsigned char *src, unsigned char *dst, long sa
 }
 
 static void
-conv_16_F (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_16_F (const Babl    *conversion,
+           unsigned char *src, 
+           unsigned char *dst, 
+           long           samples)
 {
   long n = samples;
 
@@ -127,7 +139,10 @@ conv_16_F (const Babl *conversion,unsigned char *src, unsigned char *dst, long s
 }
 
 static void
-conv_F_D (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_F_D (const Babl    *conversion,
+          unsigned char *src, 
+          unsigned char *dst, 
+          long           samples)
 {
   long n = samples;
 
@@ -140,7 +155,10 @@ conv_F_D (const Babl *conversion,unsigned char *src, unsigned char *dst, long sa
 }
 
 static void
-conv_D_F (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_D_F (const Babl    *conversion,
+          unsigned char *src, 
+          unsigned char *dst, 
+          long           samples)
 {
   long n = samples;
 
@@ -153,7 +171,10 @@ conv_D_F (const Babl *conversion,unsigned char *src, unsigned char *dst, long sa
 }
 
 static void
-conv_16_8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_16_8 (const Babl    *conversion,
+           unsigned char *src, 
+           unsigned char *dst, 
+           long           samples)
 {
   long n = samples;
 
@@ -178,7 +199,10 @@ conv_16_8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long s
 }
 
 static void
-conv_8_16 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_8_16 (const Babl    *conversion,
+           unsigned char *src, 
+           unsigned char *dst, 
+           long           samples)
 {
   long n = samples;
 
@@ -192,7 +216,10 @@ conv_8_16 (const Babl *conversion,unsigned char *src, unsigned char *dst, long s
 
 /*********/
 static void
-conv_rgbaF_rgba8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_rgbaF_rgba8 (const Babl    *conversion,
+                  unsigned char *src, 
+                  unsigned char *dst, 
+                  long           samples)
 {
   conv_F_8 (conversion, src, dst, samples * 4);
 }
@@ -200,13 +227,19 @@ conv_rgbaF_rgba8 (const Babl *conversion,unsigned char *src, unsigned char *dst,
 #define conv_rgbaF_rgbP8    conv_rgbaF_rgba8
 
 static void
-conv_rgbF_rgb8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_rgbF_rgb8 (const Babl    *conversion,
+                unsigned char *src, 
+                unsigned char *dst, 
+                long           samples)
 {
   conv_F_8 (conversion, src, dst, samples * 3);
 }
 
 static void
-conv_gaF_ga8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_gaF_ga8 (const Babl    *conversion,
+              unsigned char *src, 
+              unsigned char *dst, 
+              long           samples)
 {
   conv_F_8 (conversion, src, dst, samples * 2);
 }
@@ -216,31 +249,46 @@ conv_gaF_ga8 (const Babl *conversion,unsigned char *src, unsigned char *dst, lon
 #define conv_gAF_gA8        conv_gaF_ga8
 
 static void
-conv_rgbaF_rgba16 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_rgbaF_rgba16 (const Babl    *conversion,
+                   unsigned char *src, 
+                   unsigned char *dst, 
+                   long           samples)
 {
   conv_F_16 (conversion, src, dst, samples * 4);
 }
 
 static void
-conv_rgbaF_rgbaD (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_rgbaF_rgbaD (const Babl    *conversion,
+                  unsigned char *src, 
+                  unsigned char *dst, 
+                  long           samples)
 {
   conv_F_D (conversion, src, dst, samples * 4);
 }
 
 static void
-conv_rgbaD_rgbaF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_rgbaD_rgbaF (const Babl    *conversion,
+                  unsigned char *src, 
+                  unsigned char *dst, 
+                  long           samples)
 {
   conv_D_F (conversion, src, dst, samples * 4);
 }
 
 static void
-conv_rgbF_rgb16 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_rgbF_rgb16 (const Babl    *conversion,
+                 unsigned char *src, 
+                 unsigned char *dst, 
+                 long           samples)
 {
   conv_F_16 (conversion, src, dst, samples * 3);
 }
 
 static void
-conv_gaF_ga16 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_gaF_ga16 (const Babl    *conversion,
+               unsigned char *src, 
+               unsigned char *dst, 
+               long           samples)
 {
   conv_F_16 (conversion, src, dst, samples * 2);
 }
@@ -252,19 +300,28 @@ conv_gaF_ga16 (const Babl *conversion,unsigned char *src, unsigned char *dst, lo
 #define conv_gAF_gA16        conv_gaF_ga16
 
 static void
-conv_rgba8_rgbaF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_rgba8_rgbaF (const Babl    *conversion,
+                  unsigned char *src, 
+                  unsigned char *dst, 
+                  long           samples)
 {
   conv_8_F (conversion, src, dst, samples * 4);
 }
 
 static void
-conv_rgb8_rgbF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_rgb8_rgbF (const Babl    *conversion,
+                unsigned char *src, 
+                unsigned char *dst, 
+                long           samples)
 {
   conv_8_F (conversion, src, dst, samples * 3);
 }
 
 static void
-conv_ga8_gaF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_ga8_gaF (const Babl    *conversion,
+              unsigned char *src, 
+              unsigned char *dst, 
+              long           samples)
 {
   conv_8_F (conversion, src, dst, samples * 2);
 }
@@ -274,19 +331,28 @@ conv_ga8_gaF (const Babl *conversion,unsigned char *src, unsigned char *dst, lon
 #define conv_g8_gF          conv_8_F
 
 static void
-conv_rgba16_rgbaF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_rgba16_rgbaF (const Babl    *conversion,
+                   unsigned char *src, 
+                   unsigned char *dst, 
+                   long           samples)
 {
   conv_16_F (conversion, src, dst, samples * 4);
 }
 
 static void
-conv_rgb16_rgbF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_rgb16_rgbF (const Babl    *conversion,
+                 unsigned char *src, 
+                 unsigned char *dst, 
+                 long           samples)
 {
   conv_16_F (conversion, src, dst, samples * 3);
 }
 
 static void
-conv_ga16_gaF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_ga16_gaF (const Babl    *conversion,
+               unsigned char *src, 
+               unsigned char *dst, 
+               long           samples)
 {
   conv_16_F (conversion, src, dst, samples * 2);
 }
@@ -296,19 +362,28 @@ conv_ga16_gaF (const Babl *conversion,unsigned char *src, unsigned char *dst, lo
 #define conv_g16_gF          conv_16_F
 
 static void
-conv_rgba16_rgba8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_rgba16_rgba8 (const Babl    *conversion,
+                   unsigned char *src, 
+                   unsigned char *dst, 
+                   long           samples)
 {
   conv_16_8 (conversion, src, dst, samples * 4);
 }
 
 static void
-conv_rgb16_rgb8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_rgb16_rgb8 (const Babl    *conversion,
+                 unsigned char *src, 
+                 unsigned char *dst, 
+                 long           samples)
 {
   conv_16_8 (conversion, src, dst, samples * 3);
 }
 
 static void
-conv_ga16_ga8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_ga16_ga8 (const Babl    *conversion,
+               unsigned char *src, 
+               unsigned char *dst, 
+               long           samples)
 {
   conv_16_8 (conversion, src, dst, samples * 2);
 }
@@ -318,19 +393,28 @@ conv_ga16_ga8 (const Babl *conversion,unsigned char *src, unsigned char *dst, lo
 #define conv_g16_g8          conv_16_8
 
 static void
-conv_rgba8_rgba16 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_rgba8_rgba16 (const Babl    *conversion,
+                   unsigned char *src, 
+                   unsigned char *dst, 
+                   long           samples)
 {
   conv_8_16 (conversion, src, dst, samples * 4);
 }
 
 static void
-conv_rgb8_rgb16 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_rgb8_rgb16 (const Babl    *conversion,
+                 unsigned char *src, 
+                 unsigned char *dst, 
+                 long           samples)
 {
   conv_8_16 (conversion, src, dst, samples * 3);
 }
 
 static void
-conv_ga8_ga16 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_ga8_ga16 (const Babl    *conversion,
+               unsigned char *src, 
+               unsigned char *dst, 
+               long           samples)
 {
   conv_8_16 (conversion, src, dst, samples * 2);
 }
@@ -342,7 +426,10 @@ conv_ga8_ga16 (const Babl *conversion,unsigned char *src, unsigned char *dst, lo
 /* alpha conversions */
 
 static void
-conv_gaF_gAF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_gaF_gAF (const Babl    *conversion,
+              unsigned char *src, 
+              unsigned char *dst, 
+              long           samples)
 {
   long n = samples;
 
@@ -360,7 +447,10 @@ conv_gaF_gAF (const Babl *conversion,unsigned char *src, unsigned char *dst, lon
 }
 
 static void
-conv_gAF_gaF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_gAF_gaF (const Babl    *conversion,
+              unsigned char *src, 
+              unsigned char *dst, 
+              long           samples)
 {
   long n = samples;
 
@@ -383,7 +473,10 @@ conv_gAF_gaF (const Babl *conversion,unsigned char *src, unsigned char *dst, lon
 /* alpha stripping and adding */
 
 static void
-conv_rgbaF_rgbF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_rgbaF_rgbF (const Babl    *conversion,
+                 unsigned char *src, 
+                 unsigned char *dst, 
+                 long           samples)
 {
   long n = samples;
 
@@ -404,7 +497,10 @@ conv_rgbaF_rgbF (const Babl *conversion,unsigned char *src, unsigned char *dst,
 
 
 static void
-conv_gF_rgbaF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_gF_rgbaF (const Babl    *conversion,
+               unsigned char *src, 
+               unsigned char *dst, 
+               long           samples)
 {
   long n = samples;
 
@@ -425,7 +521,10 @@ conv_gF_rgbaF (const Babl *conversion,unsigned char *src, unsigned char *dst, lo
 #define conv_gF_rgbAF conv_gF_rgbaF
 
 static void
-conv_rgbF_rgbaF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_rgbF_rgbaF (const Babl    *conversion,
+                 unsigned char *src, 
+                 unsigned char *dst, 
+                 long           samples)
 {
   long n = samples;
 
@@ -446,7 +545,10 @@ conv_rgbF_rgbaF (const Babl *conversion,unsigned char *src, unsigned char *dst,
 }
 
 static void
-conv_gaF_gF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_gaF_gF (const Babl    *conversion,
+             unsigned char *src, 
+             unsigned char *dst, 
+             long           samples)
 {
   long n = samples;
 
@@ -460,7 +562,10 @@ conv_gaF_gF (const Babl *conversion,unsigned char *src, unsigned char *dst, long
 }
 
 static void
-conv_gF_gaF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_gF_gaF (const Babl    *conversion,
+             unsigned char *src, 
+             unsigned char *dst, 
+             long           samples)
 {
   long n = samples;
 
@@ -481,7 +586,10 @@ conv_gF_gaF (const Babl *conversion,unsigned char *src, unsigned char *dst, long
 /* colorchannel dropping and adding */
 
 static void
-conv_gF_rgbF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_gF_rgbF (const Babl    *conversion,
+              unsigned char *src, 
+              unsigned char *dst, 
+              long           samples)
 {
   long n = samples;
 
@@ -499,7 +607,10 @@ conv_gF_rgbF (const Babl *conversion,unsigned char *src, unsigned char *dst, lon
 }
 
 static void
-conv_gaF_rgbaF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_gaF_rgbaF (const Babl    *conversion,
+                unsigned char *src, 
+                unsigned char *dst, 
+                long           samples)
 {
   long n = samples;
 
@@ -524,7 +635,10 @@ conv_gaF_rgbaF (const Babl *conversion,unsigned char *src, unsigned char *dst, l
 /* other conversions coded for some optimisation reason or sumthin */
 
 static void
-conv_rgbaF_rgbA8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_rgbaF_rgbA8 (const Babl    *conversion,
+                  unsigned char *src, 
+                  unsigned char *dst, 
+                  long           samples)
 {
   long n = samples;
 
@@ -546,7 +660,10 @@ conv_rgbaF_rgbA8 (const Babl *conversion,unsigned char *src, unsigned char *dst,
 }
 
 static void
-conv_rgbaF_rgb8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_rgbaF_rgb8 (const Babl    *conversion,
+                 unsigned char *src, 
+                 unsigned char *dst, 
+                 long           samples)
 {
   long n = samples;
 
@@ -565,7 +682,10 @@ conv_rgbaF_rgb8 (const Babl *conversion,unsigned char *src, unsigned char *dst,
 }
 
 static void
-conv_rgbaF_rgb16 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_rgbaF_rgb16 (const Babl    *conversion,
+                  unsigned char *src, 
+                  unsigned char *dst, 
+                  long           samples)
 {
   long n = samples;
 
@@ -584,7 +704,10 @@ conv_rgbaF_rgb16 (const Babl *conversion,unsigned char *src, unsigned char *dst,
 }
 
 static void
-conv_rgba8_rgbA8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_rgba8_rgbA8 (const Babl    *conversion,
+                  unsigned char *src, 
+                  unsigned char *dst, 
+                  long           samples)
 {
   long n = samples;
 
@@ -612,7 +735,10 @@ conv_rgba8_rgbA8 (const Babl *conversion,unsigned char *src, unsigned char *dst,
 }
 
 static void
-conv_rgbA8_rgba8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_rgbA8_rgba8 (const Babl    *conversion,
+                  unsigned char *src, 
+                  unsigned char *dst, 
+                  long           samples)
 {
   long n = samples;
 
@@ -641,7 +767,10 @@ conv_rgbA8_rgba8 (const Babl *conversion,unsigned char *src, unsigned char *dst,
 }
 
 static void
-conv_rgb8_rgba8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_rgb8_rgba8 (const Babl    *conversion,
+                 unsigned char *src, 
+                 unsigned char *dst, 
+                 long           samples)
 {
   long n = samples;
 
@@ -660,7 +789,10 @@ conv_rgb8_rgba8 (const Babl *conversion,unsigned char *src, unsigned char *dst,
 #define conv_rgb8_rgbA8    conv_rgb8_rgba8
 
 static void
-conv_rgba8_rgb8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_rgba8_rgb8 (const Babl    *conversion,
+                 unsigned char *src, 
+                 unsigned char *dst, 
+                 long           samples)
 {
   long n = samples;
 
diff --git a/extensions/gggl-table-lies.c b/extensions/gggl-table-lies.c
index e70a45a..51ce57e 100644
--- a/extensions/gggl-table-lies.c
+++ b/extensions/gggl-table-lies.c
@@ -152,7 +152,10 @@ gggl_float_to_index16 (float f)
 
 
 static void
-conv_F_8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_F_8 (const Babl    *conversion,
+          unsigned char *src, 
+          unsigned char *dst, 
+          long           samples)
 {
   long n = samples;
 
@@ -168,7 +171,10 @@ conv_F_8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long sa
 }
 
 static void
-conv_F_16 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_F_16 (const Babl    *conversion,
+          unsigned char *src, 
+          unsigned char *dst, 
+          long           samples)
 {
   long n = samples;
 
@@ -184,7 +190,10 @@ conv_F_16 (const Babl *conversion,unsigned char *src, unsigned char *dst, long s
 }
 
 static void
-conv_8_F (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_8_F (const Babl    *conversion,
+          unsigned char *src, 
+          unsigned char *dst, 
+          long           samples)
 {
   long n = samples;
 
@@ -199,7 +208,10 @@ conv_8_F (const Babl *conversion,unsigned char *src, unsigned char *dst, long sa
 }
 
 static void
-conv_16_F (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_16_F (const Babl    *conversion,
+          unsigned char *src, 
+          unsigned char *dst, 
+          long           samples)
 {
   long n = samples;
 
@@ -215,7 +227,10 @@ conv_16_F (const Babl *conversion,unsigned char *src, unsigned char *dst, long s
 
 /*********/
 static void
-conv_rgbaF_rgba8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_rgbaF_rgba8 (const Babl    *conversion,
+                  unsigned char *src, 
+                  unsigned char *dst, 
+                  long           samples)
 {
   conv_F_8 (conversion, src, dst, samples * 4);
 }
@@ -223,13 +238,19 @@ conv_rgbaF_rgba8 (const Babl *conversion,unsigned char *src, unsigned char *dst,
 #define conv_rgbaF_rgbP8    conv_rgbaF_rgba8
 
 static void
-conv_rgbF_rgb8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_rgbF_rgb8 (const Babl    *conversion,
+                unsigned char *src, 
+                unsigned char *dst, 
+                long           samples)
 {
   conv_F_8 (conversion, src, dst, samples * 3);
 }
 
 static void
-conv_gaF_ga8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_gaF_ga8 (const Babl    *conversion,
+              unsigned char *src, 
+              unsigned char *dst, 
+              long           samples)
 {
   conv_F_8 (conversion, src, dst, samples * 2);
 }
@@ -239,19 +260,28 @@ conv_gaF_ga8 (const Babl *conversion,unsigned char *src, unsigned char *dst, lon
 #define conv_gAF_gA8        conv_gaF_ga8
 
 static void
-conv_rgbaF_rgba16 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_rgbaF_rgba16 (const Babl    *conversion,
+                   unsigned char *src, 
+                   unsigned char *dst, 
+                   long           samples)
 {
   conv_F_16 (conversion, src, dst, samples * 4);
 }
 
 static void
-conv_rgbF_rgb16 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_rgbF_rgb16 (const Babl    *conversion,
+                 unsigned char *src, 
+                 unsigned char *dst, 
+                 long           samples)
 {
   conv_F_16 (conversion, src, dst, samples * 3);
 }
 
 static void
-conv_gaF_ga16 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_gaF_ga16 (const Babl    *conversion,
+               unsigned char *src, 
+               unsigned char *dst, 
+               long           samples)
 {
   conv_F_16 (conversion, src, dst, samples * 2);
 }
@@ -261,19 +291,28 @@ conv_gaF_ga16 (const Babl *conversion,unsigned char *src, unsigned char *dst, lo
 #define conv_gAF_gA16        conv_gaF_ga16
 
 static void
-conv_rgba8_rgbaF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_rgba8_rgbaF (const Babl    *conversion,
+                  unsigned char *src, 
+                  unsigned char *dst, 
+                  long           samples)
 {
   conv_8_F (conversion, src, dst, samples * 4);
 }
 
 static void
-conv_rgb8_rgbF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_rgb8_rgbF (const Babl    *conversion,
+                unsigned char *src, 
+                unsigned char *dst, 
+                long           samples)
 {
   conv_8_F (conversion, src, dst, samples * 3);
 }
 
 static void
-conv_ga8_gaF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_ga8_gaF (const Babl    *conversion,
+              unsigned char *src, 
+              unsigned char *dst, 
+              long           samples)
 {
   conv_8_F (conversion, src, dst, samples * 2);
 }
@@ -283,19 +322,28 @@ conv_ga8_gaF (const Babl *conversion,unsigned char *src, unsigned char *dst, lon
 #define conv_g8_gF          conv_8_F
 
 static void
-conv_rgba16_rgbaF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_rgba16_rgbaF (const Babl    *conversion,
+                   unsigned char *src, 
+                   unsigned char *dst, 
+                   long           samples)
 {
   conv_16_F (conversion, src, dst, samples * 4);
 }
 
 static void
-conv_rgb16_rgbF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_rgb16_rgbF (const Babl    *conversion,
+                 unsigned char *src, 
+                 unsigned char *dst, 
+                 long           samples)
 {
   conv_16_F (conversion, src, dst, samples * 3);
 }
 
 static void
-conv_ga16_gaF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_ga16_gaF (const Babl    *conversion,
+               unsigned char *src, 
+               unsigned char *dst, 
+               long           samples)
 {
   conv_16_F (conversion, src, dst, samples * 2);
 }
@@ -305,7 +353,8 @@ conv_ga16_gaF (const Babl *conversion,unsigned char *src, unsigned char *dst, lo
 #define conv_g16_gF          conv_16_F
 
 static void
-conv_rgbafloat_linear_cairo32_le (const Babl *conversion,unsigned char *src_char,
+conv_rgbafloat_linear_cairo32_le (const Babl    *conversion,
+                                  unsigned char *src_char,
                                   unsigned char *dst,
                                   long           samples)
 {
diff --git a/extensions/gggl-table.c b/extensions/gggl-table.c
index a06a649..60c4420 100644
--- a/extensions/gggl-table.c
+++ b/extensions/gggl-table.c
@@ -144,7 +144,10 @@ gggl_float_to_index16 (float f)
 }
 
 static void
-conv_F_8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_F_8 (const Babl    *conversion,
+          unsigned char *src, 
+          unsigned char *dst, 
+          long samples)
 {
   long n = samples;
 
@@ -161,7 +164,10 @@ conv_F_8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long sa
 
 
 static void
-conv_F_16 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_F_16 (const Babl    *conversion,
+           unsigned char *src, 
+           unsigned char *dst, 
+           long samples)
 {
   long n = samples;
 
@@ -177,7 +183,10 @@ conv_F_16 (const Babl *conversion,unsigned char *src, unsigned char *dst, long s
 }
 
 static void
-conv_8_F (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_8_F (const Babl    *conversion,
+          unsigned char *src, 
+          unsigned char *dst, 
+          long samples)
 {
   long n = samples;
 
@@ -192,7 +201,10 @@ conv_8_F (const Babl *conversion,unsigned char *src, unsigned char *dst, long sa
 }
 
 static void
-conv_rgb8_rgbaF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_rgb8_rgbaF (const Babl    *conversion,
+                 unsigned char *src, 
+                 unsigned char *dst, 
+                 long samples)
 {
   long n = samples;
 
@@ -215,7 +227,10 @@ conv_rgb8_rgbaF (const Babl *conversion,unsigned char *src, unsigned char *dst,
 }
 
 static void
-conv_16_F (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_16_F (const Babl    *conversion,
+           unsigned char *src, 
+           unsigned char *dst, 
+           long samples)
 {
   long n = samples;
 
@@ -230,7 +245,10 @@ conv_16_F (const Babl *conversion,unsigned char *src, unsigned char *dst, long s
 }
 
 static void
-conv_rgbaF_rgb8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_rgbaF_rgb8 (const Babl    *conversion,
+                 unsigned char *src, 
+                 unsigned char *dst, 
+                 long samples)
 {
   long n = samples;
 
@@ -258,19 +276,28 @@ conv_rgbaF_rgb8 (const Babl *conversion,unsigned char *src, unsigned char *dst,
 
 /*********/
 static void
-conv_rgbaF_rgba8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_rgbaF_rgba8 (const Babl    *conversion,
+                  unsigned char *src, 
+                  unsigned char *dst, 
+                  long samples)
 {
   conv_F_8 (conversion, src, dst, samples * 4);
 }
 
 static void
-conv_rgbF_rgb8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_rgbF_rgb8 (const Babl    *conversion,
+                unsigned char *src, 
+                unsigned char *dst, 
+                long samples)
 {
   conv_F_8 (conversion, src, dst, samples * 3);
 }
 
 static void
-conv_gaF_ga8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_gaF_ga8 (const Babl    *conversion,
+              unsigned char *src, 
+              unsigned char *dst, 
+              long samples)
 {
   conv_F_8 (conversion, src, dst, samples * 2);
 }
@@ -280,19 +307,28 @@ conv_gaF_ga8 (const Babl *conversion,unsigned char *src, unsigned char *dst, lon
 #define conv_gAF_gA8        conv_gaF_ga8
 
 static void
-conv_rgbaF_rgba16 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_rgbaF_rgba16 (const Babl    *conversion,
+                   unsigned char *src, 
+                   unsigned char *dst, 
+                   long samples)
 {
   conv_F_16 (conversion, src, dst, samples * 4);
 }
 
 static void
-conv_rgbF_rgb16 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_rgbF_rgb16 (const Babl    *conversion,
+                 unsigned char *src, 
+                 unsigned char *dst, 
+                 long samples)
 {
   conv_F_16 (conversion, src, dst, samples * 3);
 }
 
 static void
-conv_gaF_ga16 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_gaF_ga16 (const Babl    *conversion,
+               unsigned char *src, 
+               unsigned char *dst, 
+               long samples)
 {
   conv_F_16 (conversion, src, dst, samples * 2);
 }
@@ -302,20 +338,29 @@ conv_gaF_ga16 (const Babl *conversion,unsigned char *src, unsigned char *dst, lo
 #define conv_gAF_gA16        conv_gaF_ga16
 
 static void
-conv_rgba8_rgbaF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_rgba8_rgbaF (const Babl    *conversion,
+                  unsigned char *src, 
+                  unsigned char *dst, 
+                  long samples)
 {
   conv_8_F (conversion, src, dst, samples * 4);
 }
 
 
 static void
-conv_rgb8_rgbF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_rgb8_rgbF (const Babl    *conversion,
+                unsigned char *src, 
+                unsigned char *dst, 
+                long samples)
 {
   conv_8_F (conversion, src, dst, samples * 3);
 }
 
 static void
-conv_ga8_gaF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_ga8_gaF (const Babl    *conversion,
+              unsigned char *src, 
+              unsigned char *dst, 
+              long samples)
 {
   conv_8_F (conversion, src, dst, samples * 2);
 }
@@ -325,19 +370,28 @@ conv_ga8_gaF (const Babl *conversion,unsigned char *src, unsigned char *dst, lon
 #define conv_g8_gF          conv_8_F
 
 static void
-conv_rgba16_rgbaF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_rgba16_rgbaF (const Babl    *conversion,
+                   unsigned char *src, 
+                   unsigned char *dst, 
+                   long samples)
 {
   conv_16_F (conversion, src, dst, samples * 4);
 }
 
 static void
-conv_rgb16_rgbF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_rgb16_rgbF (const Babl    *conversion,
+                 unsigned char *src, 
+                 unsigned char *dst, 
+                 long samples)
 {
   conv_16_F (conversion, src, dst, samples * 3);
 }
 
 static void
-conv_ga16_gaF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_ga16_gaF (const Babl    *conversion,
+               unsigned char *src, 
+               unsigned char *dst, 
+               long samples)
 {
   conv_16_F (conversion, src, dst, samples * 2);
 }
diff --git a/extensions/gggl.c b/extensions/gggl.c
index 2108260..34068f1 100644
--- a/extensions/gggl.c
+++ b/extensions/gggl.c
@@ -50,7 +50,10 @@
  */
 
 static void
-conv_F_8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_F_8 (const Babl    *conversion,
+          unsigned char *src, 
+          unsigned char *dst, 
+          long           samples)
 {
   long n = samples;
 
@@ -69,7 +72,10 @@ conv_F_8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long sa
 }
 
 static void
-conv_F_16 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_F_16 (const Babl    *conversion,
+           unsigned char *src, 
+           unsigned char *dst, 
+           long           samples)
 {
   long n = samples;
 
@@ -94,7 +100,10 @@ conv_F_16 (const Babl *conversion,unsigned char *src, unsigned char *dst, long s
 }
 
 static void
-conv_8_F (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_8_F (const Babl    *conversion,
+          unsigned char *src, 
+          unsigned char *dst, 
+          long           samples)
 {
   long n = samples;
 
@@ -107,7 +116,10 @@ conv_8_F (const Babl *conversion,unsigned char *src, unsigned char *dst, long sa
 }
 
 static void
-conv_16_F (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_16_F (const Babl    *conversion,
+           unsigned char *src, 
+           unsigned char *dst, 
+           long           samples)
 {
   long n = samples;
 
@@ -120,7 +132,10 @@ conv_16_F (const Babl *conversion,unsigned char *src, unsigned char *dst, long s
 }
 
 static void
-conv_rgbaF_rgb8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_rgbaF_rgb8 (const Babl    *conversion,
+                 unsigned char *src, 
+                 unsigned char *dst, 
+                 long           samples)
 {
   long n = samples;
 
@@ -145,7 +160,10 @@ conv_rgbaF_rgb8 (const Babl *conversion,unsigned char *src, unsigned char *dst,
 }
 
 static void
-conv_F_D (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_F_D (const Babl    *conversion,
+          unsigned char *src, 
+          unsigned char *dst, 
+          long           samples)
 {
   long n = samples;
 
@@ -158,7 +176,10 @@ conv_F_D (const Babl *conversion,unsigned char *src, unsigned char *dst, long sa
 }
 
 static void
-conv_D_F (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_D_F (const Babl    *conversion,
+          unsigned char *src, 
+          unsigned char *dst, 
+          long           samples)
 {
   long n = samples;
 
@@ -171,7 +192,10 @@ conv_D_F (const Babl *conversion,unsigned char *src, unsigned char *dst, long sa
 }
 
 static void
-conv_16_8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_16_8 (const Babl    *conversion,
+           unsigned char *src, 
+           unsigned char *dst, 
+           long           samples)
 {
   long n = samples;
 
@@ -196,7 +220,10 @@ conv_16_8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long s
 }
 
 static inline void
-conv_8_16 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_8_16 (const Babl    *conversion,
+           unsigned char *src, 
+           unsigned char *dst, 
+           long           samples)
 {
   long n = samples;
   while (n--)
@@ -210,19 +237,28 @@ conv_8_16 (const Babl *conversion,unsigned char *src, unsigned char *dst, long s
 
 /*********/
 static void
-conv_rgbaF_rgba8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_rgbaF_rgba8 (const Babl    *conversion,
+                  unsigned char *src, 
+                  unsigned char *dst, 
+                  long           samples)
 {
   conv_F_8 (conversion, src, dst, samples * 4);
 }
 
 static void
-conv_rgbF_rgb8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_rgbF_rgb8 (const Babl    *conversion,
+                unsigned char *src, 
+                unsigned char *dst, 
+                long           samples)
 {
   conv_F_8 (conversion, src, dst, samples * 3);
 }
 
 static void
-conv_gaF_ga8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_gaF_ga8 (const Babl    *conversion,
+              unsigned char *src, 
+              unsigned char *dst, 
+              long           samples)
 {
   conv_F_8 (conversion, src, dst, samples * 2);
 }
@@ -232,19 +268,28 @@ conv_gaF_ga8 (const Babl *conversion,unsigned char *src, unsigned char *dst, lon
 #define conv_gAF_gA8        conv_gaF_ga8
 
 static void
-conv_rgbaF_rgba16 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_rgbaF_rgba16 (const Babl    *conversion,
+                   unsigned char *src, 
+                   unsigned char *dst, 
+                   long           samples)
 {
   conv_F_16 (conversion, src, dst, samples * 4);
 }
 
 static void
-conv_rgbF_rgb16 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_rgbF_rgb16 (const Babl    *conversion,
+                 unsigned char *src, 
+                 unsigned char *dst, 
+                 long           samples)
 {
   conv_F_16 (conversion, src, dst, samples * 3);
 }
 
 static void
-conv_gaF_ga16 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_gaF_ga16 (const Babl    *conversion,
+               unsigned char *src, 
+               unsigned char *dst, 
+               long           samples)
 {
   conv_F_16 (conversion, src, dst, samples * 2);
 }
@@ -254,20 +299,29 @@ conv_gaF_ga16 (const Babl *conversion,unsigned char *src, unsigned char *dst, lo
 #define conv_gAF_gA16        conv_gaF_ga16
 
 static void
-conv_rgba8_rgbaF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_rgba8_rgbaF (const Babl    *conversion,
+                  unsigned char *src, 
+                  unsigned char *dst, 
+                  long           samples)
 {
   conv_8_F (conversion, src, dst, samples * 4);
 }
 
 
 static void
-conv_rgb8_rgbF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_rgb8_rgbF (const Babl    *conversion,
+                unsigned char *src, 
+                unsigned char *dst, 
+                long           samples)
 {
   conv_8_F (conversion, src, dst, samples * 3);
 }
 
 static void
-conv_ga8_gaF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_ga8_gaF (const Babl    *conversion,
+              unsigned char *src, 
+              unsigned char *dst, 
+              long           samples)
 {
   conv_8_F (conversion, src, dst, samples * 2);
 }
@@ -277,31 +331,46 @@ conv_ga8_gaF (const Babl *conversion,unsigned char *src, unsigned char *dst, lon
 #define conv_g8_gF          conv_8_F
 
 static void
-conv_rgbaF_rgbaD (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_rgbaF_rgbaD (const Babl    *conversion,
+                  unsigned char *src, 
+                  unsigned char *dst, 
+                  long           samples)
 {
   conv_F_D (conversion, src, dst, samples * 4);
 }
 
 static void
-conv_rgbaD_rgbaF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_rgbaD_rgbaF (const Babl    *conversion,
+                  unsigned char *src, 
+                  unsigned char *dst, 
+                  long           samples)
 {
   conv_D_F (conversion, src, dst, samples * 4);
 }
 
 static void
-conv_rgba16_rgbaF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_rgba16_rgbaF (const Babl    *conversion,
+                   unsigned char *src, 
+                   unsigned char *dst, 
+                   long           samples)
 {
   conv_16_F (conversion, src, dst, samples * 4);
 }
 
 static void
-conv_rgb16_rgbF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_rgb16_rgbF (const Babl    *conversion,
+                 unsigned char *src, 
+                 unsigned char *dst, 
+                 long           samples)
 {
   conv_16_F (conversion, src, dst, samples * 3);
 }
 
 static void
-conv_ga16_gaF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_ga16_gaF (const Babl    *conversion,
+               unsigned char *src, 
+               unsigned char *dst, 
+               long           samples)
 {
   conv_16_F (conversion, src, dst, samples * 2);
 }
@@ -311,19 +380,28 @@ conv_ga16_gaF (const Babl *conversion,unsigned char *src, unsigned char *dst, lo
 #define conv_g16_gF          conv_16_F
 
 static void
-conv_rgba16_rgba8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_rgba16_rgba8 (const Babl    *conversion,
+                   unsigned char *src, 
+                   unsigned char *dst, 
+                   long           samples)
 {
   conv_16_8 (conversion, src, dst, samples * 4);
 }
 
 static void
-conv_rgb16_rgb8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_rgb16_rgb8 (const Babl    *conversion,
+                 unsigned char *src, 
+                 unsigned char *dst, 
+                 long           samples)
 {
   conv_16_8 (conversion, src, dst, samples * 3);
 }
 
 static void
-conv_ga16_ga8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_ga16_ga8 (const Babl    *conversion,
+               unsigned char *src, 
+               unsigned char *dst, 
+               long           samples)
 {
   conv_16_8 (conversion, src, dst, samples * 2);
 }
@@ -333,19 +411,28 @@ conv_ga16_ga8 (const Babl *conversion,unsigned char *src, unsigned char *dst, lo
 #define conv_g16_g8          conv_16_8
 
 static void
-conv_rgba8_rgba16 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_rgba8_rgba16 (const Babl    *conversion,
+                   unsigned char *src, 
+                   unsigned char *dst, 
+                   long           samples)
 {
   conv_8_16 (conversion, src, dst, samples * 4);
 }
 
 static void
-conv_rgb8_rgb16 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_rgb8_rgb16 (const Babl    *conversion,
+                 unsigned char *src, 
+                 unsigned char *dst, 
+                 long           samples)
 {
   conv_8_16 (conversion, src, dst, samples * 3);
 }
 
 static void
-conv_ga8_ga16 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_ga8_ga16 (const Babl    *conversion,
+               unsigned char *src, 
+               unsigned char *dst, 
+               long           samples)
 {
   conv_8_16 (conversion, src, dst, samples * 2);
 }
@@ -357,7 +444,10 @@ conv_ga8_ga16 (const Babl *conversion,unsigned char *src, unsigned char *dst, lo
 /* alpha conversions */
 
 static void
-conv_gaF_gAF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_gaF_gAF (const Babl    *conversion,
+              unsigned char *src, 
+              unsigned char *dst, 
+              long           samples)
 {
   long n = samples;
 
@@ -375,7 +465,10 @@ conv_gaF_gAF (const Babl *conversion,unsigned char *src, unsigned char *dst, lon
 }
 
 static void
-conv_gAF_gaF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_gAF_gaF (const Babl    *conversion,
+              unsigned char *src, 
+              unsigned char *dst, 
+              long           samples)
 {
   long n = samples;
 
@@ -398,7 +491,10 @@ conv_gAF_gaF (const Babl *conversion,unsigned char *src, unsigned char *dst, lon
 /* alpha stripping and adding */
 
 static void
-conv_rgbaF_rgbF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_rgbaF_rgbF (const Babl    *conversion,
+                 unsigned char *src, 
+                 unsigned char *dst, 
+                 long           samples)
 {
   long n = samples;
 
@@ -418,7 +514,10 @@ conv_rgbaF_rgbF (const Babl *conversion,unsigned char *src, unsigned char *dst,
 }
 
 static void
-conv_rgbF_rgbaF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_rgbF_rgbaF (const Babl    *conversion,
+                 unsigned char *src, 
+                 unsigned char *dst, 
+                 long           samples)
 {
   long n = samples;
   float *fsrc = (void*) src;
@@ -437,7 +536,10 @@ conv_rgbF_rgbaF (const Babl *conversion,unsigned char *src, unsigned char *dst,
 
 
 static void
-conv_gaF_gF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_gaF_gF (const Babl    *conversion,
+             unsigned char *src, 
+             unsigned char *dst, 
+             long           samples)
 {
   long n = samples;
 
@@ -451,7 +553,10 @@ conv_gaF_gF (const Babl *conversion,unsigned char *src, unsigned char *dst, long
 }
 
 static void
-conv_gF_gaF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_gF_gaF (const Babl    *conversion,
+             unsigned char *src, 
+             unsigned char *dst, 
+             long           samples)
 {
   long n = samples;
 
@@ -472,7 +577,10 @@ conv_gF_gaF (const Babl *conversion,unsigned char *src, unsigned char *dst, long
 /* colorchannel dropping and adding */
 
 static void
-conv_gF_rgbF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_gF_rgbF (const Babl    *conversion,
+              unsigned char *src, 
+              unsigned char *dst, 
+              long           samples)
 {
   long n = samples;
 
@@ -490,7 +598,10 @@ conv_gF_rgbF (const Babl *conversion,unsigned char *src, unsigned char *dst, lon
 }
 
 static void
-conv_g8_rgb8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_g8_rgb8 (const Babl    *conversion,
+              unsigned char *src, 
+              unsigned char *dst, 
+              long           samples)
 {
   long n = samples;
 
@@ -505,7 +616,10 @@ conv_g8_rgb8 (const Babl *conversion,unsigned char *src, unsigned char *dst, lon
 }
 #define conv_g8_rgbA8  conv_g8_rgba8
 static void
-conv_g8_rgba8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_g8_rgba8 (const Babl    *conversion,
+               unsigned char *src, 
+               unsigned char *dst, 
+               long           samples)
 {
   long n = samples;
 
@@ -521,7 +635,10 @@ conv_g8_rgba8 (const Babl *conversion,unsigned char *src, unsigned char *dst, lo
 }
 
 static void
-conv_gaF_rgbaF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_gaF_rgbaF (const Babl    *conversion,
+                unsigned char *src, 
+                unsigned char *dst, 
+                long           samples)
 {
   long n = samples;
 
@@ -547,7 +664,10 @@ conv_gaF_rgbaF (const Babl *conversion,unsigned char *src, unsigned char *dst, l
 
 
 static void
-conv_rgbaF_rgbA8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_rgbaF_rgbA8 (const Babl    *conversion,
+                  unsigned char *src, 
+                  unsigned char *dst, 
+                  long           samples)
 {
   long n = samples;
 
@@ -569,7 +689,10 @@ conv_rgbaF_rgbA8 (const Babl *conversion,unsigned char *src, unsigned char *dst,
 }
 
 static void
-conv_rgbaF_rgb16 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_rgbaF_rgb16 (const Babl    *conversion,
+                  unsigned char *src, 
+                  unsigned char *dst, 
+                  long           samples)
 {
   long n = samples;
 
@@ -593,7 +716,10 @@ conv_rgbaF_rgb16 (const Babl *conversion,unsigned char *src, unsigned char *dst,
 }
 
 static void
-conv_rgbA16_rgbaF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_rgbA16_rgbaF (const Babl    *conversion,
+                   unsigned char *src, 
+                   unsigned char *dst, 
+                   long           samples)
 {
   long n = samples;
 
@@ -621,7 +747,10 @@ conv_rgbA16_rgbaF (const Babl *conversion,unsigned char *src, unsigned char *dst
 }
 
 static void
-conv_gF_rgbaF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_gF_rgbaF (const Babl    *conversion,
+               unsigned char *src, 
+               unsigned char *dst, 
+               long           samples)
 {
   long n = samples;
 
@@ -721,7 +850,10 @@ conv_gF_rgbaF (const Babl *conversion,unsigned char *src, unsigned char *dst, lo
    }
  */
 static void
-conv_rgba8_rgbA8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_rgba8_rgbA8 (const Babl    *conversion,
+                  unsigned char *src, 
+                  unsigned char *dst, 
+                  long           samples)
 {
   long n = samples;
 
@@ -749,7 +881,10 @@ conv_rgba8_rgbA8 (const Babl *conversion,unsigned char *src, unsigned char *dst,
 }
 
 static void
-conv_rgbA8_rgba8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_rgbA8_rgba8 (const Babl    *conversion,
+                  unsigned char *src, 
+                  unsigned char *dst, 
+                  long           samples)
 {
   long n = samples;
 
@@ -781,7 +916,10 @@ conv_rgbA8_rgba8 (const Babl *conversion,unsigned char *src, unsigned char *dst,
 }
 
 static void
-conv_rgb8_rgba8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_rgb8_rgba8 (const Babl    *conversion,
+                 unsigned char *src, 
+                 unsigned char *dst, 
+                 long           samples)
 {
   long n = samples-1;
   while (n--)
@@ -799,7 +937,10 @@ conv_rgb8_rgba8 (const Babl *conversion,unsigned char *src, unsigned char *dst,
 #define conv_rgb8_rgbA8    conv_rgb8_rgba8
 
 static void
-conv_rgba8_rgb8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_rgba8_rgb8 (const Babl    *conversion,
+                 unsigned char *src, 
+                 unsigned char *dst, 
+                 long           samples)
 {
   long n = samples;
 
@@ -814,7 +955,10 @@ conv_rgba8_rgb8 (const Babl *conversion,unsigned char *src, unsigned char *dst,
 }
 
 static void
-conv_rgbA8_rgb8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_rgbA8_rgb8 (const Babl    *conversion,
+                 unsigned char *src, 
+                 unsigned char *dst, 
+                 long           samples)
 {
   long n = samples;
 
@@ -869,7 +1013,10 @@ conv_rgbA8_rgb8 (const Babl *conversion,unsigned char *src, unsigned char *dst,
 
 
   static void
-conv_yuvaF_rgbaF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_yuvaF_rgbaF (const Babl    *conversion,
+                  unsigned char *src, 
+                  unsigned char *dst, 
+                  long           samples)
 {
   float *src_f = (float *) src;
   float *dst_f = (float *) dst;
@@ -900,7 +1047,10 @@ conv_yuvaF_rgbaF (const Babl *conversion,unsigned char *src, unsigned char *dst,
 
 
 static void
-conv_yuvF_rgbF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+conv_yuvF_rgbF (const Babl    *conversion,
+                unsigned char *src, 
+                unsigned char *dst, 
+                long           samples)
 {
   float *src_f = (float *) src;
   float *dst_f = (float *) dst;
diff --git a/extensions/gimp-8bit.c b/extensions/gimp-8bit.c
index 000ce0e..6252180 100644
--- a/extensions/gimp-8bit.c
+++ b/extensions/gimp-8bit.c
@@ -68,7 +68,8 @@ tables_init (const Babl *space)
 }
 
 static inline void
-u8_linear_to_float_linear (const Babl *conversion,unsigned char *src,
+u8_linear_to_float_linear (const Babl    *conversion,
+                           unsigned char *src,
                            unsigned char *dst,
                            long           samples)
 {
@@ -81,7 +82,8 @@ u8_linear_to_float_linear (const Babl *conversion,unsigned char *src,
 
 
 static void
-u8_linear_to_float_linear_premul (const Babl *conversion,unsigned char *src,
+u8_linear_to_float_linear_premul (const Babl    *conversion,
+                                  unsigned char *src,
                                   unsigned char *dst,
                                   long           samples)
 {
@@ -101,7 +103,8 @@ u8_linear_to_float_linear_premul (const Babl *conversion,unsigned char *src,
 }
 
 static inline void
-u8_gamma_2_2_to_float_linear (const Babl *conversion,unsigned char *src,
+u8_gamma_2_2_to_float_linear (const Babl    *conversion,
+                              unsigned char *src,
                               unsigned char *dst,
                               long           samples)
 {
@@ -114,7 +117,8 @@ u8_gamma_2_2_to_float_linear (const Babl *conversion,unsigned char *src,
 }
 
 static void
-conv_rgba8_linear_rgbaF_linear (const Babl *conversion,unsigned char *src,
+conv_rgba8_linear_rgbaF_linear (const Babl    *conversion,
+                                unsigned char *src,
                                 unsigned char *dst,
                                 long           samples)
 {
@@ -122,16 +126,18 @@ conv_rgba8_linear_rgbaF_linear (const Babl *conversion,unsigned char *src,
 }
 
 static void
-conv_rgba8_linear_ragabaaF_linear (const Babl *conversion,unsigned char *src,
-                                unsigned char *dst,
-                                long           samples)
+conv_rgba8_linear_ragabaaF_linear (const Babl    *conversion,
+                                   unsigned char *src,
+                                   unsigned char *dst,
+                                   long           samples)
 {
   u8_linear_to_float_linear_premul (conversion, src, dst, samples);
 }
 
 
 static void
-conv_rgba8_gamma_2_2_rgbaF_linear (const Babl *conversion,unsigned char *src,
+conv_rgba8_gamma_2_2_rgbaF_linear (const Babl    *conversion,
+                                   unsigned char *src,
                                    unsigned char *dst,
                                    long           samples)
 {
@@ -149,7 +155,8 @@ conv_rgba8_gamma_2_2_rgbaF_linear (const Babl *conversion,unsigned char *src,
 }
 
 static void
-conv_rgb8_linear_rgbF_linear (const Babl *conversion,unsigned char *src,
+conv_rgb8_linear_rgbF_linear (const Babl    *conversion,
+                              unsigned char *src,
                               unsigned char *dst,
                               long           samples)
 {
@@ -157,7 +164,8 @@ conv_rgb8_linear_rgbF_linear (const Babl *conversion,unsigned char *src,
 }
 
 static void
-conv_rgb8_gamma_2_2_rgbF_linear (const Babl *conversion,unsigned char *src,
+conv_rgb8_gamma_2_2_rgbF_linear (const Babl    *conversion,
+                                 unsigned char *src,
                                  unsigned char *dst,
                                  long           samples)
 {
@@ -165,7 +173,8 @@ conv_rgb8_gamma_2_2_rgbF_linear (const Babl *conversion,unsigned char *src,
 }
 
 static void
-conv_rgb8_linear_rgbaF_linear (const Babl *conversion,unsigned char *src,
+conv_rgb8_linear_rgbaF_linear (const Babl    *conversion,
+                               unsigned char *src,
                                unsigned char *dst,
                                long           samples)
 {
@@ -184,7 +193,8 @@ conv_rgb8_linear_rgbaF_linear (const Babl *conversion,unsigned char *src,
 #define conv_rgb8_linear_ragabaaF_linear conv_rgb8_linear_rgbaF_linear
 
 static void
-conv_rgb8_gamma_2_2_rgbaF_linear (const Babl *conversion,unsigned char *src,
+conv_rgb8_gamma_2_2_rgbaF_linear (const Babl    *conversion,
+                                  unsigned char *src,
                                   unsigned char *dst,
                                   long           samples)
 {
@@ -202,7 +212,8 @@ conv_rgb8_gamma_2_2_rgbaF_linear (const Babl *conversion,unsigned char *src,
 }
 
 static void
-conv_ga8_linear_gaF_linear (const Babl *conversion,unsigned char *src,
+conv_ga8_linear_gaF_linear (const Babl    *conversion,
+                            unsigned char *src,
                             unsigned char *dst,
                             long           samples)
 {
@@ -210,7 +221,8 @@ conv_ga8_linear_gaF_linear (const Babl *conversion,unsigned char *src,
 }
 
 static void
-conv_ga8_gamma_2_2_gaF_linear (const Babl *conversion,unsigned char *src,
+conv_ga8_gamma_2_2_gaF_linear (const Babl    *conversion,
+                               unsigned char *src,
                                unsigned char *dst,
                                long           samples)
 {
@@ -226,7 +238,8 @@ conv_ga8_gamma_2_2_gaF_linear (const Babl *conversion,unsigned char *src,
 }
 
 static void
-conv_ga8_gamma_2_2_rgba8_gamma_2_2 (const Babl *conversion,unsigned char *src,
+conv_ga8_gamma_2_2_rgba8_gamma_2_2 (const Babl    *conversion,
+                                    unsigned char *src,
                                     unsigned char *dst,
                                     long           samples)
 {
@@ -242,7 +255,8 @@ conv_ga8_gamma_2_2_rgba8_gamma_2_2 (const Babl *conversion,unsigned char *src,
 }
 
 static void
-conv_ga8_linear_rgbaF_linear (const Babl *conversion,unsigned char *src,
+conv_ga8_linear_rgbaF_linear (const Babl    *conversion,
+                              unsigned char *src,
                               unsigned char *dst,
                               long           samples)
 {
@@ -261,7 +275,8 @@ conv_ga8_linear_rgbaF_linear (const Babl *conversion,unsigned char *src,
 }
 
 static void
-conv_ga8_gamma_2_2_rgbaF_linear (const Babl *conversion,unsigned char *src,
+conv_ga8_gamma_2_2_rgbaF_linear (const Babl    *conversion,
+                                 unsigned char *src,
                                  unsigned char *dst,
                                  long           samples)
 {
@@ -281,7 +296,8 @@ conv_ga8_gamma_2_2_rgbaF_linear (const Babl *conversion,unsigned char *src,
 }
 
 static void
-conv_g8_linear_gF_linear (const Babl *conversion,unsigned char *src,
+conv_g8_linear_gF_linear (const Babl    *conversion,
+                          unsigned char *src,
                           unsigned char *dst,
                           long           samples)
 {
@@ -289,7 +305,8 @@ conv_g8_linear_gF_linear (const Babl *conversion,unsigned char *src,
 }
 
 static void
-conv_g8_gamma_2_2_gF_linear (const Babl *conversion,unsigned char *src,
+conv_g8_gamma_2_2_gF_linear (const Babl    *conversion,
+                             unsigned char *src,
                              unsigned char *dst,
                              long           samples)
 {
@@ -297,7 +314,8 @@ conv_g8_gamma_2_2_gF_linear (const Babl *conversion,unsigned char *src,
 }
 
 static void
-conv_g8_linear_rgbaF_linear (const Babl *conversion,unsigned char *src,
+conv_g8_linear_rgbaF_linear (const Babl    *conversion,
+                             unsigned char *src,
                              unsigned char *dst,
                              long           samples)
 {
@@ -316,7 +334,8 @@ conv_g8_linear_rgbaF_linear (const Babl *conversion,unsigned char *src,
 }
 
 static void
-conv_g8_gamma_2_2_rgbaF_linear (const Babl *conversion,unsigned char *src,
+conv_g8_gamma_2_2_rgbaF_linear (const Babl    *conversion,
+                                unsigned char *src,
                                 unsigned char *dst,
                                 long           samples)
 {
@@ -336,7 +355,8 @@ conv_g8_gamma_2_2_rgbaF_linear (const Babl *conversion,unsigned char *src,
 }
 
 static void
-conv_rgbaF_linear_rgb8_linear (const Babl *conversion,unsigned char *src,
+conv_rgbaF_linear_rgb8_linear (const Babl    *conversion,
+                               unsigned char *src,
                                unsigned char *dst,
                                long           samples)
 {
@@ -360,7 +380,8 @@ conv_rgbaF_linear_rgb8_linear (const Babl *conversion,unsigned char *src,
 }
 
 static void
-conv_rgbaF_linear_rgba8_linear (const Babl *conversion,unsigned char *src,
+conv_rgbaF_linear_rgba8_linear (const Babl    *conversion,
+                                unsigned char *src,
                                 unsigned char *dst,
                                 long           samples)
 {
diff --git a/extensions/grey.c b/extensions/grey.c
index 6afcedb..11ad587 100644
--- a/extensions/grey.c
+++ b/extensions/grey.c
@@ -25,7 +25,8 @@
 #include "extensions/util.h"
 
 static void
-conv_rgbaF_linear_y8_linear (const Babl *conversion,unsigned char *src,
+conv_rgbaF_linear_y8_linear (const Babl    *conversion,
+                             unsigned char *src,
                              unsigned char *dst,
                              long           samples)
 {
@@ -53,7 +54,8 @@ conv_rgbaF_linear_y8_linear (const Babl *conversion,unsigned char *src,
 }
 
 static void
-conv_rgbaF_linear_yF_linear (const Babl *conversion,unsigned char *src,
+conv_rgbaF_linear_yF_linear (const Babl    *conversion,
+                             unsigned char *src,
                              unsigned char *dst,
                              long           samples)
 {
@@ -79,7 +81,8 @@ conv_rgbaF_linear_yF_linear (const Babl *conversion,unsigned char *src,
 }
 
 static void
-conv_rgbaF_linear_yaF_linear (const Babl *conversion,unsigned char *src,
+conv_rgbaF_linear_yaF_linear (const Babl    *conversion,
+                              unsigned char *src,
                               unsigned char *dst,
                               long           samples)
 {
diff --git a/extensions/half.c b/extensions/half.c
index 1342f78..26786ab 100644
--- a/extensions/half.c
+++ b/extensions/half.c
@@ -75,7 +75,10 @@
 #include "babl.h"
 #include "extensions/util.h"
 
-static void halfp2singles_fun(void *target, const void *source, long numel)
+static void 
+halfp2singles_fun(void       *target, 
+                  const void *source, 
+                  long        numel)
 {
     uint16_t *hp = (uint16_t *) source; // Type pun input as an unsigned 16-bit int
     uint32_t *xp = (uint32_t *) target; // Type pun output as an unsigned 32-bit int
@@ -124,7 +127,10 @@ static void halfp2singles_fun(void *target, const void *source, long numel)
 
 static float half_float_table[65536];
 
-static void halfp2singles(void *target, const void *source, long numel)
+static void 
+halfp2singles(void       *target, 
+              const void *source, 
+              long        numel)
 {
   uint16_t *src = (uint16_t *) source;
   float *dst = (float *) target;
@@ -204,7 +210,8 @@ const unsigned char half_float_shift_table[512] = {
 24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,13
 };
 
-static inline unsigned short float_to_half_float(float f)
+static inline unsigned short 
+float_to_half_float(float f)
 {
   // See Blink::Source/platform/graphics/gpu/WebGLImageConversion.cpp::convertFloatToHalfFloat() and 
http://crbug.com/491784
   union {
@@ -219,7 +226,10 @@ static inline unsigned short float_to_half_float(float f)
   return half_float_base_table[signexp] + ((temp & 0x007fffff) >> half_float_shift_table[signexp]);
 }
 
-static void singles2halfp(void *target, const void *source, long numel)
+static void 
+singles2halfp(void       *target, 
+              const void *source, 
+              long        numel)
 {
   const float *src = source;
   uint16_t    *dst = target;
@@ -229,25 +239,37 @@ static void singles2halfp(void *target, const void *source, long numel)
 }
 
 static inline void
-conv_yHalf_yF (const Babl *conversion,const uint16_t *src, float *dst, long samples)
+conv_yHalf_yF (const Babl     *conversion,
+               const uint16_t *src, 
+               float          *dst, 
+               long            samples)
 {
   halfp2singles(dst, src, samples);
 }
 
 static void
-conv_yaHalf_yaF (const Babl *conversion,const uint16_t *src, float *dst, long samples)
+conv_yaHalf_yaF (const Babl     *conversion,
+                 const uint16_t *src, 
+                 float          *dst, 
+                 long            samples)
 {
   conv_yHalf_yF (conversion, src, dst, samples * 2);
 }
 
 static void
-conv_rgbHalf_rgbF (const Babl *conversion,const uint16_t *src, float *dst, long samples)
+conv_rgbHalf_rgbF (const Babl     *conversion,
+                   const uint16_t *src, 
+                   float          *dst, 
+                   long            samples)
 {
   conv_yHalf_yF (conversion, src, dst, samples * 3);
 }
 
 static void
-conv_rgbaHalf_rgbaF (const Babl *conversion,const uint16_t *src, float *dst, long samples)
+conv_rgbaHalf_rgbaF (const Babl     *conversion,
+                     const uint16_t *src, 
+                     float          *dst, 
+                     long            samples)
 {
   conv_yHalf_yF (conversion, src, dst, samples * 4);
 }
@@ -255,32 +277,47 @@ conv_rgbaHalf_rgbaF (const Babl *conversion,const uint16_t *src, float *dst, lon
 #define conv_rgbAHalf_rgbAF  conv_rgbaHalf_rgbaF
 
 static void
-conv_yF_yHalf (const Babl *conversion,const float *src, uint16_t *dst, long samples)
+conv_yF_yHalf (const Babl  *conversion,
+               const float *src, 
+               uint16_t    *dst, 
+               long         samples)
 {
   singles2halfp (dst, src, samples);
 }
 
 static void
-conv_yaF_yaHalf (const Babl *conversion,const float *src, uint16_t *dst, long samples)
+conv_yaF_yaHalf (const Babl  *conversion,
+                 const float *src, 
+                 uint16_t    *dst, 
+                 long         samples)
 {
   conv_yF_yHalf (conversion, src, dst, samples * 2);
 }
 
 static void
-conv_rgbF_rgbHalf (const Babl *conversion,const float *src, uint16_t *dst, long samples)
+conv_rgbF_rgbHalf (const Babl  *conversion,
+                   const float *src, 
+                   uint16_t    *dst, 
+                   long         samples)
 {
   conv_yF_yHalf (conversion, src, dst, samples * 3);
 }
 
 static void
-conv_rgbaF_rgbaHalf (const Babl *conversion,const float *src, uint16_t *dst, long samples)
+conv_rgbaF_rgbaHalf (const Babl  *conversion,
+                     const float *src, 
+                     uint16_t    *dst, 
+                     long         samples)
 {
   conv_yF_yHalf (conversion, src, dst, samples * 4);
 }
 
 #define conv_rgbAF_rgbAHalf  conv_rgbaF_rgbaHalf
 
-static void singles2halfp2(void *target, const void *source, long numel)
+static void 
+singles2halfp2(void       *target, 
+               const void *source, 
+               long        numel)
 {
     uint16_t *hp = (uint16_t *) target; // Type pun output as an unsigned 16-bit int
     uint32_t *xp = (uint32_t *) source; // Type pun input as an unsigned 32-bit int
@@ -336,25 +373,37 @@ static void singles2halfp2(void *target, const void *source, long numel)
 }
 
 static void
-conv2_yF_yHalf (const Babl *conversion,const float *src, uint16_t *dst, long samples)
+conv2_yF_yHalf (const Babl  *conversion,
+                const float *src, 
+                uint16_t    *dst, 
+                long         samples)
 {
   singles2halfp2 (dst, src, samples);
 }
 
 static void
-conv2_yaF_yaHalf (const Babl *conversion,const float *src, uint16_t *dst, long samples)
+conv2_yaF_yaHalf (const Babl  *conversion,
+                  const float *src, 
+                  uint16_t    *dst, 
+                  long         samples)
 {
   conv2_yF_yHalf (conversion, src, dst, samples * 2);
 }
 
 static void
-conv2_rgbF_rgbHalf (const Babl *conversion,const float *src, uint16_t *dst, long samples)
+conv2_rgbF_rgbHalf (const Babl  *conversion,
+                    const float *src, 
+                    uint16_t    *dst, 
+                    long         samples)
 {
   conv2_yF_yHalf (conversion, src, dst, samples * 3);
 }
 
 static void
-conv2_rgbaF_rgbaHalf (const Babl *conversion,const float *src, uint16_t *dst, long samples)
+conv2_rgbaF_rgbaHalf (const Babl  *conversion,
+                      const float *src, 
+                      uint16_t    *dst, 
+                      long         samples)
 {
   conv2_yF_yHalf (conversion, src, dst, samples * 4);
 }
diff --git a/extensions/simple.c b/extensions/simple.c
index 072568d..617e369 100644
--- a/extensions/simple.c
+++ b/extensions/simple.c
@@ -6,7 +6,10 @@ int init (void);
 
 
 static inline void
-float_to_u8_x1 (const Babl *conversion,unsigned char *src_char, unsigned char *dst, long samples)
+float_to_u8_x1 (const Babl    *conversion,
+                unsigned char *src_char, 
+                unsigned char *dst, 
+                long           samples)
 {
   float *src = (float *)src_char;
   long n = samples;
@@ -20,19 +23,28 @@ float_to_u8_x1 (const Babl *conversion,unsigned char *src_char, unsigned char *d
 }
 
 static inline void
-float_to_u8_x4 (const Babl *conversion,unsigned char *src_char, unsigned char *dst, long samples)
+float_to_u8_x4 (const Babl    *conversion,
+                unsigned char *src_char, 
+                unsigned char *dst, 
+                long           samples)
 {
   float_to_u8_x1 (conversion, src_char, dst, samples * 4);
 }
 
 static inline void
-float_to_u8_x3 (const Babl *conversion,unsigned char *src_char, unsigned char *dst, long samples)
+float_to_u8_x3 (const Babl    *conversion,
+                unsigned char *src_char, 
+                unsigned char *dst, 
+                long           samples)
 {
   float_to_u8_x1 (conversion, src_char, dst, samples * 3);
 }
 
 static inline void
-float_to_u8_x2 (const Babl *conversion,unsigned char *src_char, unsigned char *dst, long samples)
+float_to_u8_x2 (const Babl    *conversion,
+                unsigned char *src_char, 
+                unsigned char *dst, 
+                long           samples)
 {
   float_to_u8_x1 (conversion, src_char, dst, samples * 2);
 }
@@ -40,7 +52,10 @@ float_to_u8_x2 (const Babl *conversion,unsigned char *src_char, unsigned char *d
 
 
 static inline void
-float_pre_to_u8_pre (const Babl *conversion,unsigned char *src_char, unsigned char *dst, long samples)
+float_pre_to_u8_pre (const Babl    *conversion,
+                     unsigned char *src_char, 
+                     unsigned char *dst, 
+                     long           samples)
 {
   float *src = (float *)src_char;
   long n = samples;
@@ -70,7 +85,10 @@ float_pre_to_u8_pre (const Babl *conversion,unsigned char *src_char, unsigned ch
 }
 
 static inline void
-float_to_u16_x1 (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples)
+float_to_u16_x1 (const Babl    *conversion,
+                 unsigned char *src_char, 
+                 unsigned char *dst_char, 
+                 long           samples)
 {
   float *src    = (float *)src_char;
   uint16_t *dst = (uint16_t *)dst_char;
@@ -84,23 +102,35 @@ float_to_u16_x1 (const Babl *conversion,unsigned char *src_char, unsigned char *
     }
 }
 static inline void
-float_to_u16_x2 (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples)
+float_to_u16_x2 (const Babl    *conversion,
+                 unsigned char *src_char, 
+                 unsigned char *dst_char, 
+                 long           samples)
 {
   float_to_u16_x1 (conversion, src_char, dst_char, samples * 2);
 }
 static inline void
-float_to_u16_x3 (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples)
+float_to_u16_x3 (const Babl    *conversion,
+                 unsigned char *src_char, 
+                 unsigned char *dst_char, 
+                 long           samples)
 {
   float_to_u16_x1 (conversion, src_char, dst_char, samples * 3);
 }
 static inline void
-float_to_u16_x4 (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples)
+float_to_u16_x4 (const Babl    *conversion,
+                 unsigned char *src_char, 
+                 unsigned char *dst_char, 
+                 long           samples)
 {
   float_to_u16_x1 (conversion, src_char, dst_char, samples * 4);
 }
 
 static inline void
-float_pre_to_u16_pre (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples)
+float_pre_to_u16_pre (const Babl    *conversion,
+                      unsigned char *src_char, 
+                      unsigned char *dst_char, 
+                      long           samples)
 {
   float *src = (float *)src_char;
   uint16_t *dst = (uint16_t *)dst_char;
@@ -130,7 +160,10 @@ float_pre_to_u16_pre (const Babl *conversion,unsigned char *src_char, unsigned c
 }
 
 static inline void
-float_pre_to_u32_pre (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples)
+float_pre_to_u32_pre (const Babl    *conversion,
+                      unsigned char *src_char, 
+                      unsigned char *dst_char, 
+                      long           samples)
 {
   float *src = (float *)src_char;
   uint32_t *dst = (uint32_t *)dst_char;
@@ -161,7 +194,10 @@ float_pre_to_u32_pre (const Babl *conversion,unsigned char *src_char, unsigned c
 
 
 static inline void
-float_to_u32_x1 (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples)
+float_to_u32_x1 (const Babl    *conversion,
+                 unsigned char *src_char, 
+                 unsigned char *dst_char, 
+                 long           samples)
 {
   float *src    = (float *)src_char;
   uint32_t *dst = (uint32_t *)dst_char;
@@ -177,24 +213,36 @@ float_to_u32_x1 (const Babl *conversion,unsigned char *src_char, unsigned char *
     }
 }
 static void
-float_to_u32_x2 (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples)
+float_to_u32_x2 (const Babl    *conversion,
+                 unsigned char *src_char, 
+                 unsigned char *dst_char, 
+                 long           samples)
 {
   float_to_u32_x1 (conversion, src_char, dst_char, samples * 2);
 }
 static void
-float_to_u32_x3 (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples)
+float_to_u32_x3 (const Babl    *conversion,
+                 unsigned char *src_char, 
+                 unsigned char *dst_char, 
+                 long           samples)
 {
   float_to_u32_x1 (conversion, src_char, dst_char, samples * 3);
 }
 static void
-float_to_u32_x4 (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples)
+float_to_u32_x4 (const Babl    *conversion,
+                 unsigned char *src_char, 
+                 unsigned char *dst_char, 
+                 long           samples)
 {
   float_to_u32_x1 (conversion, src_char, dst_char, samples * 4);
 }
 
 
 static inline void
-u32_to_float (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples)
+u32_to_float (const Babl    *conversion,
+              unsigned char *src_char, 
+              unsigned char *dst_char, 
+              long           samples)
 {
   uint32_t *src = (uint32_t *)src_char;
   float *dst    = (float *)dst_char;
@@ -208,27 +256,39 @@ u32_to_float (const Babl *conversion,unsigned char *src_char, unsigned char *dst
 }
 
 static void
-u32_to_float_x4 (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples)
+u32_to_float_x4 (const Babl    *conversion,
+                 unsigned char *src_char, 
+                 unsigned char *dst_char, 
+                 long           samples)
 {
   u32_to_float (conversion, src_char, dst_char, samples * 4);
 }
 
 static void
-u32_to_float_x3 (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples)
+u32_to_float_x3 (const Babl    *conversion,
+                 unsigned char *src_char, 
+                 unsigned char *dst_char, 
+                 long           samples)
 {
   u32_to_float (conversion, src_char, dst_char, samples * 3);
 }
 
 
 static void
-u32_to_float_x2 (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples)
+u32_to_float_x2 (const Babl    *conversion,
+                 unsigned char *src_char, 
+                 unsigned char *dst_char, 
+                 long           samples)
 {
   u32_to_float (conversion, src_char, dst_char, samples * 2);
 }
 
 
 static inline void
-u16_to_float (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples)
+u16_to_float (const Babl    *conversion,
+              unsigned char *src_char, 
+              unsigned char *dst_char, 
+              long           samples)
 {
   uint16_t *src = (uint16_t *)src_char;
   float *dst    = (float *)dst_char;
@@ -242,26 +302,38 @@ u16_to_float (const Babl *conversion,unsigned char *src_char, unsigned char *dst
 }
 
 static void
-u16_to_float_x4 (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples)
+u16_to_float_x4 (const Babl    *conversion,
+                 unsigned char *src_char, 
+                 unsigned char *dst_char, 
+                 long           samples)
 {
   u16_to_float (conversion, src_char, dst_char, samples * 4);
 }
 
 static void
-u16_to_float_x3 (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples)
+u16_to_float_x3 (const Babl    *conversion,
+                 unsigned char *src_char, 
+                 unsigned char *dst_char, 
+                 long           samples)
 {
   u16_to_float (conversion, src_char, dst_char, samples * 3);
 }
 
 
 static void
-u16_to_float_x2 (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples)
+u16_to_float_x2 (const Babl    *conversion,
+                 unsigned char *src_char, 
+                 unsigned char *dst_char, 
+                 long           samples)
 {
   u16_to_float (conversion, src_char, dst_char, samples * 2);
 }
 
 static inline void
-yau16_rgbaf (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples)
+yau16_rgbaf (const Babl    *conversion,
+             unsigned char *src_char, 
+             unsigned char *dst_char, 
+             long           samples)
 {
   uint16_t *src = (uint16_t *)src_char;
   float *dst    = (float *)dst_char;
diff --git a/extensions/sse-half.c b/extensions/sse-half.c
index 4b57392..c2fe6a3 100644
--- a/extensions/sse-half.c
+++ b/extensions/sse-half.c
@@ -30,7 +30,10 @@
 #include "extensions/util.h"
 
 static inline void
-conv_yHalf_yF (const Babl *conversion,const uint16_t *src, float *dst, long samples)
+conv_yHalf_yF (const Babl     *conversion,
+               const uint16_t *src, 
+               float          *dst, 
+               long            samples)
 {
   const uint64_t *s_vec;
   __v4sf         *d_vec;
@@ -61,25 +64,37 @@ conv_yHalf_yF (const Babl *conversion,const uint16_t *src, float *dst, long samp
 }
 
 static void
-conv_yaHalf_yaF (const Babl *conversion,const uint16_t *src, float *dst, long samples)
+conv_yaHalf_yaF (const Babl     *conversion,
+                 const uint16_t *src, 
+                 float          *dst, 
+                 long            samples)
 {
   conv_yHalf_yF (conversion, src, dst, samples * 2);
 }
 
 static void
-conv_rgbHalf_rgbF (const Babl *conversion,const uint16_t *src, float *dst, long samples)
+conv_rgbHalf_rgbF (const Babl     *conversion,
+                   const uint16_t *src, 
+                   float          *dst, 
+                   long            samples)
 {
   conv_yHalf_yF (conversion, src, dst, samples * 3);
 }
 
 static void
-conv_rgbaHalf_rgbaF (const Babl *conversion,const uint16_t *src, float *dst, long samples)
+conv_rgbaHalf_rgbaF (const Babl     *conversion,
+                     const uint16_t *src, 
+                     float          *dst, 
+                     long            samples)
 {
   conv_yHalf_yF (conversion, src, dst, samples * 4);
 }
 
 static inline void
-conv_yF_yHalf (const Babl *conversion,const float *src, uint16_t *dst, long samples)
+conv_yF_yHalf (const Babl  *conversion,
+               const float *src, 
+               uint16_t    *dst, 
+               long         samples)
 {
   const __v4sf *s_vec;
   uint64_t     *d_vec;
@@ -110,19 +125,28 @@ conv_yF_yHalf (const Babl *conversion,const float *src, uint16_t *dst, long samp
 }
 
 static void
-conv_yaF_yaHalf (const Babl *conversion,const float *src, uint16_t *dst, long samples)
+conv_yaF_yaHalf (const Babl  *conversion,
+                 const float *src, 
+                 uint16_t    *dst, 
+                 long         samples)
 {
   conv_yF_yHalf (conversion, src, dst, samples * 2);
 }
 
 static void
-conv_rgbF_rgbHalf (const Babl *conversion,const float *src, uint16_t *dst, long samples)
+conv_rgbF_rgbHalf (const Babl  *conversion,
+                   const float *src, 
+                   uint16_t    *dst, 
+                   long         samples)
 {
   conv_yF_yHalf (conversion, src, dst, samples * 3);
 }
 
 static void
-conv_rgbaF_rgbaHalf (const Babl *conversion,const float *src, uint16_t *dst, long samples)
+conv_rgbaF_rgbaHalf (const Babl  *conversion,
+                     const float *src, 
+                     uint16_t    *dst, 
+                     long         samples)
 {
   conv_yF_yHalf (conversion, src, dst, samples * 4);
 }
diff --git a/extensions/sse2-float.c b/extensions/sse2-float.c
index d2bc50b..e12fb9a 100644
--- a/extensions/sse2-float.c
+++ b/extensions/sse2-float.c
@@ -38,7 +38,10 @@
 static const float BABL_ALPHA_THRESHOLD_FLOAT = (float)BABL_ALPHA_THRESHOLD;
 
 static void
-conv_rgbaF_linear_rgbAF_linear (const Babl *conversion,const float *src, float *dst, long samples)
+conv_rgbaF_linear_rgbAF_linear (const Babl  *conversion,
+                                const float *src,  
+                                float       *dst, 
+                                long         samples)
 {
   long i = 0;
   long remainder;
@@ -121,7 +124,10 @@ conv_rgbaF_linear_rgbAF_linear (const Babl *conversion,const float *src, float *
 }
 
 static void
-conv_rgbAF_linear_rgbaF_linear_shuffle (const Babl *conversion,const float *src, float *dst, long samples)
+conv_rgbAF_linear_rgbaF_linear_shuffle (const Babl  *conversion,
+                                        const float *src,  
+                                        float       *dst, 
+                                        long         samples)
 {
   long i = 0;
   long remainder;
@@ -190,7 +196,10 @@ conv_rgbAF_linear_rgbaF_linear_shuffle (const Babl *conversion,const float *src,
 }
 
 static void
-conv_rgbAF_linear_rgbaF_linear_spin (const Babl *conversion,const float *src, float *dst, long samples)
+conv_rgbAF_linear_rgbaF_linear_spin (const Babl  *conversion,
+                                     const float *src,  
+                                     float       *dst, 
+                                     long         samples)
 {
   long i = 0;
   long remainder;
@@ -409,7 +418,10 @@ func (const Babl *conversion,const float *src, float *dst, long samples)\
 GAMMA_RGBA(conv_rgbaF_linear_rgbaF_gamma, linear_to_gamma_2_2_sse2)
 GAMMA_RGBA(conv_rgbaF_gamma_rgbaF_linear, gamma_2_2_to_linear_sse2)
 
-static void conv_rgbaF_linear_rgbAF_gamma (const Babl *conversion,const float *src, float *dst, long samples)
+static void conv_rgbaF_linear_rgbAF_gamma (const Babl  *conversion,
+                                           const float *src,  
+                                           float       *dst, 
+                                           long         samples)
 {
   float *tmp = alloca (sizeof(float)*4*samples);
   conv_rgbaF_linear_rgbaF_gamma (conversion, src, tmp, samples);
@@ -435,7 +447,10 @@ static void conv_rgbaF_linear_rgbAF_gamma (const Babl *conversion,const float *s
 }\
 
 static void
-conv_yaF_linear_yaF_gamma (const Babl *conversion,const float *src, float *dst, long samples)
+conv_yaF_linear_yaF_gamma (const Babl  *conversion,
+                           const float *src,  
+                           float       *dst, 
+                           long         samples)
 {
   const __v4sf *s = (const __v4sf*)src;
         __v4sf *d = (__v4sf*)dst;
@@ -470,7 +485,10 @@ conv_yaF_linear_yaF_gamma (const Babl *conversion,const float *src, float *dst,
 
 
 static void
-conv_yaF_gamma_yaF_linear (const Babl *conversion,const float *src, float *dst, long samples)
+conv_yaF_gamma_yaF_linear (const Babl  *conversion,
+                           const float *src,  
+                           float       *dst, 
+                           long         samples)
 {
   const __v4sf *s = (const __v4sf*)src;
         __v4sf *d = (__v4sf*)dst;
@@ -504,7 +522,10 @@ conv_yaF_gamma_yaF_linear (const Babl *conversion,const float *src, float *dst,
 }
 
 static inline void
-conv_yF_linear_yF_gamma (const Babl *conversion,const float *src, float *dst, long samples)
+conv_yF_linear_yF_gamma (const Babl  *conversion,
+                         const float *src,  
+                         float       *dst, 
+                         long         samples)
 {
   const __v4sf *s = (const __v4sf*)src;
         __v4sf *d = (__v4sf*)dst;
@@ -541,7 +562,10 @@ conv_yF_linear_yF_gamma (const Babl *conversion,const float *src, float *dst, lo
 }
 
 static inline void
-conv_yF_gamma_yF_linear (const Babl *conversion,const float *src, float *dst, long samples)
+conv_yF_gamma_yF_linear (const Babl  *conversion,
+                         const float *src,  
+                         float       *dst, 
+                         long         samples)
 {
   const __v4sf *s = (const __v4sf*)src;
         __v4sf *d = (__v4sf*)dst;
@@ -579,14 +603,20 @@ conv_yF_gamma_yF_linear (const Babl *conversion,const float *src, float *dst, lo
 
 
 static void
-conv_rgbF_linear_rgbF_gamma (const Babl *conversion,const float *src, float *dst, long samples)
+conv_rgbF_linear_rgbF_gamma (const Babl  *conversion,
+                             const float *src,  
+                             float       *dst, 
+                             long         samples)
 {
   conv_yF_linear_yF_gamma (conversion, src, dst, samples * 3);
 }
 
 
 static void
-conv_rgbF_gamma_rgbF_linear (const Babl *conversion,const float *src, float *dst, long samples)
+conv_rgbF_gamma_rgbF_linear (const Babl  *conversion,
+                             const float *src,  
+                             float       *dst, 
+                             long         samples)
 {
   conv_yF_gamma_yF_linear (conversion, src, dst, samples * 3);
 }
diff --git a/extensions/sse2-int16.c b/extensions/sse2-int16.c
index e7b870e..52ca014 100644
--- a/extensions/sse2-int16.c
+++ b/extensions/sse2-int16.c
@@ -35,7 +35,10 @@
 static const __v4sf  u16_float = Q (1.f / 65535);
 
 static void
-conv_rgba16_rgbaF (const Babl *conversion,const uint16_t *src, float *dst, long samples)
+conv_rgba16_rgbaF (const Babl     *conversion,
+                   const uint16_t *src,
+                   float          *dst,
+                   long            samples)
 {
   long i = 0;
 
@@ -69,7 +72,10 @@ conv_rgba16_rgbaF (const Babl *conversion,const uint16_t *src, float *dst, long
 }
 
 static void
-conv_rgba16_rgbAF (const Babl *conversion,const uint16_t *src, float *dst, long samples)
+conv_rgba16_rgbAF (const Babl     *conversion,
+                   const uint16_t *src,
+                   float          *dst,
+                   long samples)
 {
   long i = 0;
   long remainder;
diff --git a/extensions/sse2-int8.c b/extensions/sse2-int8.c
index 246b251..6da1b5b 100644
--- a/extensions/sse2-int8.c
+++ b/extensions/sse2-int8.c
@@ -31,7 +31,10 @@
 #include "extensions/util.h"
 
 static inline void
-conv_yF_y8 (const Babl *conversion,const float *src, uint8_t *dst, long samples)
+conv_yF_y8 (const Babl  *conversion,
+            const float *src, 
+            uint8_t     *dst, 
+            long         samples)
 {
   const __v4sf *s_vec;
   __m128i      *d_vec;
@@ -126,26 +129,38 @@ conv_yF_y8 (const Babl *conversion,const float *src, uint8_t *dst, long samples)
 }
 
 static void
-conv_yaF_ya8 (const Babl *conversion,const float *src, uint8_t *dst, long samples)
+conv_yaF_ya8 (const Babl  *conversion,
+              const float *src, 
+              uint8_t     *dst, 
+              long         samples)
 {
   conv_yF_y8 (conversion, src, dst, samples * 2);
 }
 
 
 static void
-conv_rgbF_rgb8 (const Babl *conversion,const float *src, uint8_t *dst, long samples)
+conv_rgbF_rgb8 (const Babl  *conversion,
+                const float *src, 
+                uint8_t     *dst, 
+                long         samples)
 {
   conv_yF_y8 (conversion, src, dst, samples * 3);
 }
 
 static void
-conv_rgbaF_rgba8 (const Babl *conversion,const float *src, uint8_t *dst, long samples)
+conv_rgbaF_rgba8 (const Babl  *conversion,
+                  const float *src, 
+                  uint8_t     *dst, 
+                  long         samples)
 {
   conv_yF_y8 (conversion, src, dst, samples * 4);
 }
 
 static void
-conv_rgbAF_rgbA8 (const Babl *conversion,const float *src, uint8_t *dst, long samples)
+conv_rgbAF_rgbA8 (const Babl  *conversion,
+                  const float *src, 
+                  uint8_t     *dst, 
+                  long         samples)
 {
   conv_yF_y8 (conversion, src, dst, samples * 4);
 }
diff --git a/extensions/sse4-int8.c b/extensions/sse4-int8.c
index b74a7c6..d505fe5 100644
--- a/extensions/sse4-int8.c
+++ b/extensions/sse4-int8.c
@@ -31,7 +31,10 @@
 #include "extensions/util.h"
 
 static inline void
-conv_y8_yF (const Babl *conversion,const uint8_t *src, float *dst, long samples)
+conv_y8_yF (const Babl    *conversion,
+            const uint8_t *src, 
+            float         *dst, 
+            long           samples)
 {
   const float     factor = 1.0f / 255.0f;
   const __v4sf    factor_vec = {1.0f / 255.0f, 1.0f / 255.0f, 1.0f / 255.0f, 1.0f / 255.0f};
@@ -65,19 +68,28 @@ conv_y8_yF (const Babl *conversion,const uint8_t *src, float *dst, long samples)
 }
 
 static void
-conv_ya8_yaF (const Babl *conversion,const uint8_t *src, float *dst, long samples)
+conv_ya8_yaF (const Babl    *conversion,
+              const uint8_t *src, 
+              float         *dst, 
+              long           samples)
 {
   conv_y8_yF (conversion, src, dst, samples * 2);
 }
 
 static void
-conv_rgb8_rgbF (const Babl *conversion,const uint8_t *src, float *dst, long samples)
+conv_rgb8_rgbF (const Babl    *conversion,
+                const uint8_t *src, 
+                float         *dst, 
+                long           samples)
 {
   conv_y8_yF (conversion, src, dst, samples * 3);
 }
 
 static void
-conv_rgba8_rgbaF (const Babl *conversion,const uint8_t *src, float *dst, long samples)
+conv_rgba8_rgbaF (const Babl    *conversion,
+                  const uint8_t *src, 
+                  float         *dst, 
+                  long           samples)
 {
   conv_y8_yF (conversion, src, dst, samples * 4);
 }
diff --git a/extensions/two-table.c b/extensions/two-table.c
index dae28c8..292a88a 100644
--- a/extensions/two-table.c
+++ b/extensions/two-table.c
@@ -43,7 +43,8 @@ conv_float_u8_two_table_map (float value)
 }
 
 static void
-conv_rgbafloat_linear_cairo24_le (const Babl *conversion,unsigned char *src_char,
+conv_rgbafloat_linear_cairo24_le (const Babl    *conversion,
+                                  unsigned char *src_char,
                                   unsigned char *dst,
                                   long           samples)
 {
@@ -61,7 +62,8 @@ conv_rgbafloat_linear_cairo24_le (const Babl *conversion,unsigned char *src_char
 }
 
 static void
-conv_rgbfloat_linear_cairo24_le (const Babl *conversion,unsigned char *src_char,
+conv_rgbfloat_linear_cairo24_le (const Babl    *conversion,
+                                 unsigned char *src_char,
                                  unsigned char *dst,
                                  long           samples)
 {
@@ -80,7 +82,8 @@ conv_rgbfloat_linear_cairo24_le (const Babl *conversion,unsigned char *src_char,
 }
 
 static void
-conv_rgbafloat_linear_rgbu8_gamma (const Babl *conversion,unsigned char *src_char,
+conv_rgbafloat_linear_rgbu8_gamma (const Babl    *conversion,
+                                   unsigned char *src_char,
                                    unsigned char *dst,
                                    long           samples)
 {
@@ -108,7 +111,8 @@ conv_rgbafloat_linear_rgbu8_gamma (const Babl *conversion,unsigned char *src_cha
 
 
 static void
-conv_rgbafloat_linear_rgbau8_gamma (const Babl *conversion,unsigned char *src_char,
+conv_rgbafloat_linear_rgbau8_gamma (const Babl    *conversion,
+                                    unsigned char *src_char,
                                     unsigned char *dst,
                                     long           samples)
 {
@@ -127,7 +131,8 @@ conv_rgbafloat_linear_rgbau8_gamma (const Babl *conversion,unsigned char *src_ch
 }
 
 static void
-conv_rgbfloat_linear_rgbu8_gamma (const Babl *conversion,unsigned char *src_char,
+conv_rgbfloat_linear_rgbu8_gamma (const Babl    *conversion,
+                                  unsigned char *src_char,
                                   unsigned char *dst,
                                   long           samples)
 {
@@ -146,7 +151,8 @@ conv_rgbfloat_linear_rgbu8_gamma (const Babl *conversion,unsigned char *src_char
 }
 
 static void
-conv_yfloat_linear_yu8_gamma (const Babl *conversion,unsigned char *src_char,
+conv_yfloat_linear_yu8_gamma (const Babl    *conversion,
+                              unsigned char *src_char,
                               unsigned char *dst,
                               long           samples)
 {
@@ -160,7 +166,8 @@ conv_yfloat_linear_yu8_gamma (const Babl *conversion,unsigned char *src_char,
 }
 
 static void
-conv_yafloat_linear_yau8_gamma (const Babl *conversion,unsigned char *src_char,
+conv_yafloat_linear_yau8_gamma (const Babl    *conversion,
+                                unsigned char *src_char,
                                 unsigned char *dst,
                                 long           samples)
 {
diff --git a/extensions/u16.c b/extensions/u16.c
index 4cd37f7..87d2907 100644
--- a/extensions/u16.c
+++ b/extensions/u16.c
@@ -26,7 +26,8 @@
 #include "extensions/util.h"
 
 static void
-conv_rgbu16_rgbau16 (const Babl *conversion,unsigned char *src, 
+conv_rgbu16_rgbau16 (const Babl    *conversion,
+                     unsigned char *src, 
                      unsigned char *dst, 
                      long           samples)
 
@@ -46,7 +47,8 @@ conv_rgbu16_rgbau16 (const Babl *conversion,unsigned char *src,
 }
 
 static void
-conv_yu16_yau16 (const Babl *conversion,unsigned char *src, 
+conv_yu16_yau16 (const Babl    *conversion,
+                 unsigned char *src, 
                  unsigned char *dst, 
                  long           samples)
 
diff --git a/extensions/u32.c b/extensions/u32.c
index 1f2148f..f9d563d 100644
--- a/extensions/u32.c
+++ b/extensions/u32.c
@@ -63,7 +63,7 @@ conv_u16_u32 (const Babl    *conversion,
 
 
 static void
-conv_yau32_yau16 (const Babl    *conversion,
+conv_yau32_yau16 (const Babl      *conversion,
                     unsigned char *src,
                     unsigned char *dst,
                     long           samples)
@@ -96,7 +96,7 @@ conv_rgbu16_rgbu32 (const Babl    *conversion,
 }
 
 static void
-conv_yau16_yau32 (const Babl    *conversion,
+conv_yau16_yau32 (const Babl      *conversion,
                     unsigned char *src,
                     unsigned char *dst,
                     long           samples)
@@ -150,7 +150,8 @@ conv_rgba32_rgb32 (const Babl    *conversion,
 }
 
 static inline void
-conv_rgb32_rgba32 (const Babl *conversion,unsigned char *src,
+conv_rgb32_rgba32 (const Babl    *conversion,
+                   unsigned char *src,
                    unsigned char *dst,
                    long           samples)
 {
@@ -169,7 +170,8 @@ conv_rgb32_rgba32 (const Babl *conversion,unsigned char *src,
 
 
 static inline void
-conv_yu32_yau32 (const Babl *conversion,unsigned char *src,
+conv_yu32_yau32 (const Babl    *conversion,
+                 unsigned char *src,
                  unsigned char *dst,
                  long           samples)
 {
diff --git a/extensions/ycbcr.c b/extensions/ycbcr.c
index a71577b..fabc44d 100644
--- a/extensions/ycbcr.c
+++ b/extensions/ycbcr.c
@@ -73,9 +73,10 @@ models (void)
 
 
 static void
-rgba_to_ycbcra709 (const Babl *conversion,char *src,
-                   char *dst,
-                   long  n)
+rgba_to_ycbcra709 (const Babl *conversion,
+                   char       *src,
+                   char       *dst,
+                   long        n)
 {
   while (n--)
     {
@@ -106,9 +107,10 @@ rgba_to_ycbcra709 (const Babl *conversion,char *src,
 
 
 static void
-rgba_to_ycbcr709 (const Babl *conversion,char *src,
-                  char *dst,
-                  long  n)
+rgba_to_ycbcr709 (const Babl *conversion,
+                  char       *src,
+                  char       *dst,
+                  long        n)
 {
   while (n--)
     {
@@ -137,9 +139,10 @@ rgba_to_ycbcr709 (const Babl *conversion,char *src,
 
 
 static void
-ycbcra709_to_rgba (const Babl *conversion,char *src,
-                char *dst,
-                long  n)
+ycbcra709_to_rgba (const Babl *conversion,
+                   char       *src,
+                   char       *dst,
+                   long        n)
 {
   while (n--)
     {
@@ -170,9 +173,10 @@ ycbcra709_to_rgba (const Babl *conversion,char *src,
 
 
 static void
-ycbcr709_to_rgba (const Babl *conversion,char *src,
-               char *dst,
-               long  n)
+ycbcr709_to_rgba (const Babl *conversion,
+                  char       *src,
+                  char       *dst,
+                  long        n)
 {
   while (n--)
     {


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]