Images: Clean up old-style function declarations

diff --git a/images/color.h b/images/color.h
index ad0a5ebdcd9000442af9c55885a62c984b68efe7..dca4ed651a9e1f48441e82a57fee8cf962037c07 100644 (file)
--- a/images/color.h
+++ b/images/color.h
@@ -57,15 +57,13 @@ uns color_space_name_to_id(byte *name);
 int color_get(struct color *color, byte *src, uns src_space);
 int color_put(struct image_context *ctx, struct color *color, byte *dest, uns dest_space);
 
-static inline void
-color_make_gray(struct color *color, uns gray)
+static inline void color_make_gray(struct color *color, uns gray)
 {
   color->c[0] = gray;
   color->color_space = COLOR_SPACE_GRAYSCALE;
 }
 
-static inline void
-color_make_rgb(struct color *color, uns r, uns g, uns b)
+static inline void color_make_rgb(struct color *color, uns r, uns g, uns b)
 {
   color->c[0] = r;
   color->c[1] = g;
@@ -133,8 +131,7 @@ void color_compute_bradford_matrix(double matrix[9], const double src[2], const
 void color_compute_color_spaces_conversion_matrix(double matrix[9], const struct color_space_chromacity_info *src, const struct color_space_chromacity_info *dest);
 void color_invert_matrix(double dest[9], double matrix[9]);
 
-static inline uns
-rgb_to_gray_func(uns r, uns g, uns b)
+static inline uns rgb_to_gray_func(uns r, uns g, uns b)
 {
   return (r * 19660 + g * 38666 + b * 7210) >> 16;
 }
@@ -180,8 +177,7 @@ void srgb_to_luv_init(void);
 void srgb_to_luv_pixels(byte *dest, byte *src, uns count);
 
 /* L covers the interval [0..255]; u and v are centered to 128 and scaled by 1/4 in respect of L */
-static inline void
-srgb_to_luv_pixel(byte *dest, byte *src)
+static inline void srgb_to_luv_pixel(byte *dest, byte *src)
 {
   uns r = srgb_to_luv_tab1[src[0]];
   uns g = srgb_to_luv_tab1[src[1]];
@@ -236,8 +232,7 @@ void color_conv_pixels(byte *dest, byte *src, uns count, struct color_grid_node
 
 #define COLOR_CONV_SCALE_CONST (((((1 << COLOR_CONV_SIZE) - 1) << 16) + (1 << (16 - COLOR_CONV_OFS))) / 255)
 
-static inline void
-color_conv_pixel(byte *dest, byte *src, struct color_grid_node *grid)
+static inline void color_conv_pixel(byte *dest, byte *src, struct color_grid_node *grid)
 {
   uns s0 = src[0] * COLOR_CONV_SCALE_CONST;
   uns s1 = src[1] * COLOR_CONV_SCALE_CONST;

diff --git a/images/duplicates.h b/images/duplicates.h
index ddeddd5c65f8e317ce402b15c976f15ef1792908..9c243c37d93fc6705dcc6daeeb009ba2478be7ad 100644 (file)
--- a/images/duplicates.h
+++ b/images/duplicates.h
@@ -49,11 +49,9 @@ uns image_dup_compare(struct image_dup_context *ctx, struct image_dup *dup1, str
 
 /* internals */
 
-static inline byte *
-image_dup_block(struct image_dup *dup, uns tab_col, uns tab_row)
+static inline byte *image_dup_block(struct image_dup *dup, uns tab_col, uns tab_row)
 {
   return dup->tab_pixels + (dup->tab_row_size << tab_row) + (3 << (tab_row + tab_col));
 }
 
-
 #endif

diff --git a/images/images.h b/images/images.h
index 60bd16645500ca8440ad8bc08f1d3ad94c17a66c..19ecf47e1d778542391112f79f00c540e8424fc9 100644 (file)
--- a/images/images.h
+++ b/images/images.h
@@ -98,8 +98,7 @@ void image_clear(struct image_context *ctx, struct image *img);
 struct image *image_init_matrix(struct image_context *ctx, struct image *img, byte *pixels, uns cols, uns rows, uns row_size, uns flags);
 struct image *image_init_subimage(struct image_context *ctx, struct image *img, struct image *src, uns left, uns top, uns cols, uns rows);
 
-static inline int
-image_dimensions_valid(uns cols, uns rows)
+static inline int image_dimensions_valid(uns cols, uns rows)
 {
   return cols && rows && cols <= image_max_dim && rows <= image_max_dim;
 }

diff --git a/images/math.h b/images/math.h
index a4d561670274f7a282eebd350b1acce85d604ba1..58a884ef687bc3ec81a73e4fa447c789119ee802 100644 (file)
--- a/images/math.h
+++ b/images/math.h
@@ -4,20 +4,17 @@
 extern const u32 fast_div_tab[];
 extern const byte fast_sqrt_tab[];
 
-static inline uns
-isqr(int x)
+static inline uns isqr(int x)
 {
   return x * x;
 }
 
-static inline uns
-fast_div_u32_u8(uns x, uns y)
+static inline uns fast_div_u32_u8(uns x, uns y)
 {
   return ((u64)(x) * fast_div_tab[y]) >> 32;
 }
 
-static inline uns
-fast_sqrt_u16(uns x)
+static inline uns fast_sqrt_u16(uns x)
 {
   uns y;
   if (x < (1 << 10) - 3)
@@ -29,8 +26,7 @@ fast_sqrt_u16(uns x)
   return (x < y * y) ? y - 1 : y;
 }
 
-static inline uns
-fast_sqrt_u32(uns x)
+static inline uns fast_sqrt_u32(uns x)
 {
   uns y;
   if (x < (1 << 16))

diff --git a/images/sig-cmp-gen.h b/images/sig-cmp-gen.h
index d316cb2f43c1c49e4c48b30bdd868acfdb84fc5b..9e736817c75ca62dbf135afe482fa751784119af 100644 (file)
--- a/images/sig-cmp-gen.h
+++ b/images/sig-cmp-gen.h
@@ -2,8 +2,7 @@
 #  define MSG(x...) do{ line += sprintf(line, x); }while(0)
 #  define LINE do{ line = buf; msg(line, param); }while(0)
 
-static void
-explain_signature(struct image_signature *sig, void (*msg)(byte *text, void *param), void *param)
+static void explain_signature(struct image_signature *sig, void (*msg)(byte *text, void *param), void *param)
 {
   byte buf[1024], *line = buf;
   MSG("signature: flags=0x%x df=%u dh=%u f=(%u", sig->flags, sig->df, sig->dh, sig->vec.f[0]);
@@ -33,11 +32,9 @@ explain_signature(struct image_signature *sig, void (*msg)(byte *text, void *par
 #define MSGL(x...) do{ MSG(x); LINE; }while(0)
 
 #ifndef EXPLAIN
-static uns
-image_signatures_dist_integrated(struct image_signature *sig1, struct image_signature *sig2)
+static uns image_signatures_dist_integrated(struct image_signature *sig1, struct image_signature *sig2)
 #else
-static uns
-image_signatures_dist_integrated_explain(struct image_signature *sig1, struct image_signature *sig2, void (*msg)(byte *text, void *param), void *param)
+static uns image_signatures_dist_integrated_explain(struct image_signature *sig1, struct image_signature *sig2, void (*msg)(byte *text, void *param), void *param)
 #endif
 {
   uns dist[IMAGE_REG_MAX * IMAGE_REG_MAX], p[IMAGE_REG_MAX], q[IMAGE_REG_MAX];
@@ -226,11 +223,9 @@ image_signatures_dist_integrated_explain(struct image_signature *sig1, struct im
 }
 
 #ifndef EXPLAIN
-static uns
-image_signatures_dist_fuzzy(struct image_signature *sig1, struct image_signature *sig2)
+static uns image_signatures_dist_fuzzy(struct image_signature *sig1, struct image_signature *sig2)
 #else
-static uns
-image_signatures_dist_fuzzy_explain(struct image_signature *sig1, struct image_signature *sig2, void (*msg)(byte *text, void *param), void *param)
+static uns image_signatures_dist_fuzzy_explain(struct image_signature *sig1, struct image_signature *sig2, void (*msg)(byte *text, void *param), void *param)
 #endif
 {
 #ifdef EXPLAIN
@@ -336,11 +331,9 @@ image_signatures_dist_fuzzy_explain(struct image_signature *sig1, struct image_s
 }
 
 #ifndef EXPLAIN
-static uns
-image_signatures_dist_average(struct image_signature *sig1, struct image_signature *sig2)
+static uns image_signatures_dist_average(struct image_signature *sig1, struct image_signature *sig2)
 #else
-static uns
-image_signatures_dist_average_explain(struct image_signature *sig1, struct image_signature *sig2, void (*msg)(byte *text, void *param), void *param)
+static uns image_signatures_dist_average_explain(struct image_signature *sig1, struct image_signature *sig2, void (*msg)(byte *text, void *param), void *param)
 #endif
 {
 #ifdef EXPLAIN
@@ -362,12 +355,10 @@ image_signatures_dist_average_explain(struct image_signature *sig1, struct image
 
 #ifndef EXPLAIN
 #define CALL(x) image_signatures_dist_##x(sig1, sig2)
-uns
-image_signatures_dist(struct image_signature *sig1, struct image_signature *sig2)
+uns image_signatures_dist(struct image_signature *sig1, struct image_signature *sig2)
 #else
 #define CALL(x) image_signatures_dist_##x##_explain(sig1, sig2, msg, param)
-uns
-image_signatures_dist_explain(struct image_signature *sig1, struct image_signature *sig2, void (*msg)(byte *text, void *param), void *param)
+uns image_signatures_dist_explain(struct image_signature *sig1, struct image_signature *sig2, void (*msg)(byte *text, void *param), void *param)
 #endif
 {
   if (!sig1->len)

diff --git a/images/signature.h b/images/signature.h
index 204174768a83c3e0ed22a276691afe5e9d22ccb2..198d7ca90dbea9e6a6256289d68678b058d23635 100644 (file)
--- a/images/signature.h
+++ b/images/signature.h
@@ -56,8 +56,7 @@ struct image_cluster {
   };
 };
 
-static inline uns
-image_signature_size(uns len)
+static inline uns image_signature_size(uns len)
 {
   return OFFSETOF(struct image_signature, reg) + len * sizeof(struct image_region);
 }