From a97fed60e2e6c960a4d0bc965ca8a8dd75f0ed44 Mon Sep 17 00:00:00 2001 From: Nuno Ferreira Date: Fri, 22 Feb 2019 22:29:17 +0000 Subject: [PATCH] code style review fixed style of function headers in the babl/base folder --- babl/base/model-cmyk.c | 119 +++++++++++++++++++++++----------------- babl/base/model-gray.c | 15 ++--- babl/base/model-rgb.c | 61 ++++++++++---------- babl/base/model-ycbcr.c | 24 ++++---- babl/base/pow-24.c | 12 +++- babl/base/type-float.c | 20 +++---- babl/base/type-half.c | 58 ++++++++++++-------- babl/base/type-u15.c | 14 ++--- babl/base/type-u16.c | 72 ++++++++++++------------ babl/base/type-u32.c | 72 ++++++++++++------------ babl/base/type-u8.c | 72 ++++++++++++------------ 11 files changed, 288 insertions(+), 251 deletions(-) diff --git a/babl/base/model-cmyk.c b/babl/base/model-cmyk.c index 0d0a4c5..1c68c66 100644 --- a/babl/base/model-cmyk.c +++ b/babl/base/model-cmyk.c @@ -36,9 +36,10 @@ static void -cmyka_to_cmykA (const Babl *conversion,char *src, - char *dst, - long n) +cmyka_to_cmykA (const Babl *conversion, + char *src, + char *dst, + long n) { while (n--) { @@ -60,9 +61,10 @@ cmyka_to_cmykA (const Babl *conversion,char *src, } static void -cmykA_to_cmyka (const Babl *conversion,char *src, - char *dst, - long n) +cmykA_to_cmyka (const Babl *conversion, + char *src, + char *dst, + long n) { while (n--) { @@ -85,9 +87,10 @@ cmykA_to_cmyka (const Babl *conversion,char *src, } static void -cmyk_to_cmyka (const Babl *conversion,char *src, - char *dst, - long n) +cmyk_to_cmyka (const Babl *conversion, + char *src, + char *dst, + long n) { while (n--) { @@ -108,9 +111,10 @@ cmyk_to_cmyka (const Babl *conversion,char *src, } static void -cmyka_to_cmyk (const Babl *conversion,char *src, - char *dst, - long n) +cmyka_to_cmyk (const Babl *conversion, + char *src, + char *dst, + long n) { while (n--) { @@ -131,9 +135,10 @@ cmyka_to_cmyk (const Babl *conversion,char *src, ///////////////////// static void -cmyka_to_CMYKA (const Babl *conversion,char *src, - char *dst, - long n) +cmyka_to_CMYKA (const Babl *conversion, + char *src, + char *dst, + long n) { while (n--) { @@ -155,9 +160,10 @@ cmyka_to_CMYKA (const Babl *conversion,char *src, } static void -CMYKA_to_cmyka (const Babl *conversion,char *src, - char *dst, - long n) +CMYKA_to_cmyka (const Babl *conversion, + char *src, + char *dst, + long n) { while (n--) { @@ -182,9 +188,10 @@ CMYKA_to_cmyka (const Babl *conversion,char *src, static void -CMYK_to_cmyka (const Babl *conversion,char *src, - char *dst, - long n) +CMYK_to_cmyka (const Babl *conversion, + char *src, + char *dst, + long n) { while (n--) { @@ -205,9 +212,10 @@ CMYK_to_cmyka (const Babl *conversion,char *src, } static void -cmyka_to_CMYK (const Babl *conversion,char *src, - char *dst, - long n) +cmyka_to_CMYK (const Babl *conversion, + char *src, + char *dst, + long n) { while (n--) { @@ -227,9 +235,10 @@ cmyka_to_CMYK (const Babl *conversion,char *src, } static void -cmyka_to_CMYKa (const Babl *conversion,char *src, - char *dst, - long n) +cmyka_to_CMYKa (const Babl *conversion, + char *src, + char *dst, + long n) { while (n--) { @@ -258,9 +267,10 @@ cmyka_to_CMYKa (const Babl *conversion,char *src, #if 0 static void -rgba_to_cmykA (const Babl *conversion,char *src, - char *dst, - long n) +rgba_to_cmykA (const Babl *conversion, + char *src, + char *dst, + long n) { while (n--) { @@ -309,9 +319,10 @@ rgba_to_cmykA (const Babl *conversion,char *src, } static void -cmykA_to_rgba (const Babl *conversion,char *src, - char *dst, - long n) +cmykA_to_rgba (const Babl *conversion, + char *src, + char *dst, + long n) { while (n--) { @@ -355,9 +366,10 @@ cmykA_to_rgba (const Babl *conversion,char *src, } static void -rgba_to_cmyka (const Babl *conversion,char *src, - char *dst, - long n) +rgba_to_cmyka (const Babl *conversion, + char *src, + char *dst, + long n) { while (n--) { @@ -406,9 +418,10 @@ rgba_to_cmyka (const Babl *conversion,char *src, } static void -cmyka_to_rgba (const Babl *conversion,char *src, - char *dst, - long n) +cmyka_to_rgba (const Babl *conversion, + char *src, + char *dst, + long n) { while (n--) { @@ -446,9 +459,10 @@ cmyka_to_rgba (const Babl *conversion,char *src, } static void -rgba_to_cmyk (const Babl *conversion,char *src, - char *dst, - long n) +rgba_to_cmyk (const Babl *conversion, + char *src, + char *dst, + long n) { while (n--) { @@ -495,9 +509,10 @@ rgba_to_cmyk (const Babl *conversion,char *src, } static void -cmyk_to_rgba (const Babl *conversion,char *src, - char *dst, - long n) +cmyk_to_rgba (const Babl *conversion, + char *src, + char *dst, + long n) { while (n--) { @@ -535,9 +550,10 @@ cmyk_to_rgba (const Babl *conversion,char *src, } static void -rgba_to_cmy (const Babl *conversion,char *src, - char *dst, - long n) +rgba_to_cmy (const Babl *conversion, + char *src, + char *dst, + long n) { while (n--) { @@ -561,9 +577,10 @@ rgba_to_cmy (const Babl *conversion,char *src, } static void -cmy_to_rgba (const Babl *conversion,char *src, - char *dst, - long n) +cmy_to_rgba (const Babl *conversion, + char *src, + char *dst, + long n) { while (n--) { diff --git a/babl/base/model-gray.c b/babl/base/model-gray.c index 5805a18..210dce8 100644 --- a/babl/base/model-gray.c +++ b/babl/base/model-gray.c @@ -30,7 +30,8 @@ static void conversions (void); static void formats (void); static void init_single_precision (void); -void babl_base_model_gray (void) +void +babl_base_model_gray (void) { components (); models (); @@ -339,7 +340,7 @@ rgb_to_gray_perceptual (Babl *conversion, } static void -gray_perceptual_to_rgb (Babl *conversion, +gray_perceptual_to_rgb (Babl *conversion, int src_bands, char **src, int *src_pitch, @@ -434,7 +435,7 @@ gray_to_rgba (Babl *conversion, } static void -gray_alpha_premultiplied_to_rgba (Babl *conversion, +gray_alpha_premultiplied_to_rgba (Babl *conversion, int src_bands, char **src, int *src_pitch, @@ -471,7 +472,7 @@ gray_alpha_premultiplied_to_rgba (Babl *conversion, static void -rgba_to_gray_alpha_premultiplied (Babl *conversion, +rgba_to_gray_alpha_premultiplied (Babl *conversion, int src_bands, char **src, int *src_pitch, @@ -1097,7 +1098,7 @@ rgb_to_gray_perceptual_float (Babl *conversion, } static void -gray_perceptual_to_rgb_float (Babl *conversion, +gray_perceptual_to_rgb_float (Babl *conversion, int src_bands, char **src, int *src_pitch, @@ -1192,7 +1193,7 @@ gray_to_rgba_float (Babl *conversion, } static void -gray_alpha_premultiplied_to_rgba_float (Babl *conversion, +gray_alpha_premultiplied_to_rgba_float (Babl *conversion, int src_bands, char **src, int *src_pitch, @@ -1229,7 +1230,7 @@ gray_alpha_premultiplied_to_rgba_float (Babl *conversion, static void -rgba_to_gray_alpha_premultiplied_float (Babl *conversion, +rgba_to_gray_alpha_premultiplied_float (Babl *conversion, int src_bands, char **src, int *src_pitch, diff --git a/babl/base/model-rgb.c b/babl/base/model-rgb.c index ed4c9da..a89117c 100644 --- a/babl/base/model-rgb.c +++ b/babl/base/model-rgb.c @@ -448,9 +448,9 @@ rgba2rgba_nonlinear_premultiplied (Babl *conversion, static void rgba_nonlinear_premultiplied2rgba (Babl *conversion, - char *src, - char *dst, - long samples) + char *src, + char *dst, + long samples) { const Babl *space = babl_conversion_get_source_space (conversion); const Babl **trc = (void*)space->space.trc; @@ -535,13 +535,13 @@ static const Babl *perceptual_trc = NULL; static void g3_perceptual_from_linear (Babl *conversion, - int src_bands, - char **src, - int *src_pitch, - int dst_bands, - char **dst, - int *dst_pitch, - long samples) + int src_bands, + char **src, + int *src_pitch, + int dst_bands, + char **dst, + int *dst_pitch, + long samples) { const Babl *trc = perceptual_trc; @@ -562,13 +562,13 @@ g3_perceptual_from_linear (Babl *conversion, static void g3_perceptual_to_linear (Babl *conversion, - int src_bands, - char **src, - int *src_pitch, - int dst_bands, - char **dst, - int *dst_pitch, - long samples) + int src_bands, + char **src, + int *src_pitch, + int dst_bands, + char **dst, + int *dst_pitch, + long samples) { const Babl *trc = perceptual_trc; long n = samples; @@ -594,9 +594,9 @@ g3_perceptual_to_linear (Babl *conversion, static void rgba2rgba_perceptual_premultiplied (Babl *conversion, - char *src, - char *dst, - long samples) + char *src, + char *dst, + long samples) { const Babl *trc = perceptual_trc; long n = samples; @@ -659,9 +659,9 @@ rgba_perceptual_premultiplied2rgba (Babl *conversion, static void rgba2rgba_perceptual (Babl *conversion, - char *src, - char *dst, - long samples) + char *src, + char *dst, + long samples) { const Babl *trc = perceptual_trc; long n = samples; @@ -680,9 +680,9 @@ rgba2rgba_perceptual (Babl *conversion, static void rgba_perceptual2rgba (Babl *conversion, - char *src, - char *dst, - long samples) + char *src, + char *dst, + long samples) { const Babl *trc = perceptual_trc; long n = samples; @@ -1297,9 +1297,9 @@ rgba2rgba_nonlinear_premultiplied_float (Babl *conversion, static void rgba_nonlinear_premultiplied2rgba_float (Babl *conversion, - char *src, - char *dst, - long samples) + char *src, + char *dst, + long samples) { const Babl *space = babl_conversion_get_source_space (conversion); const Babl **trc = (void*)space->space.trc; @@ -1455,7 +1455,8 @@ g3_perceptual_to_linear_float (Babl *conversion, } -static void init_single_precision (void) +static void +init_single_precision (void) { babl_format_new ( diff --git a/babl/base/model-ycbcr.c b/babl/base/model-ycbcr.c index 91749a8..21353e6 100644 --- a/babl/base/model-ycbcr.c +++ b/babl/base/model-ycbcr.c @@ -80,9 +80,9 @@ models (void) static void rgba_to_ycbcra (BablConversion *conversion, - char *src, - char *dst, - long n) + char *src, + char *dst, + long n) { while (n--) { @@ -114,9 +114,9 @@ rgba_to_ycbcra (BablConversion *conversion, static void rgba_to_ycbcr (BablConversion *conversion, - char *src, - char *dst, - long n) + char *src, + char *dst, + long n) { while (n--) { @@ -145,9 +145,9 @@ rgba_to_ycbcr (BablConversion *conversion, static void ycbcra_to_rgba (BablConversion *conversion, - char *src, - char *dst, - long n) + char *src, + char *dst, + long n) { while (n--) { @@ -178,9 +178,9 @@ ycbcra_to_rgba (BablConversion *conversion, static void ycbcr_to_rgba (BablConversion *conversion, - char *src, - char *dst, - long n) + char *src, + char *dst, + long n) { while (n--) { diff --git a/babl/base/pow-24.c b/babl/base/pow-24.c index f691458..3bf11c8 100644 --- a/babl/base/pow-24.c +++ b/babl/base/pow-24.c @@ -33,7 +33,11 @@ * has a better convergence rate once you get reasonably close to the answer. */ static inline double -init_newton (double x, double exponent, double c0, double c1, double c2) +init_newton (double x, + double exponent, + double c0, + double c1, + double c2) { int iexp; double y = frexp(x, &iexp); @@ -97,7 +101,11 @@ babl_pow_1_24 (double x) * has a better convergence rate once you get reasonably close to the answer. */ static inline float -init_newtonf (float x, float exponent, float c0, float c1, float c2) +init_newtonf (float x, + float exponent, + float c0, + float c1, + float c2) { int iexp; float y = frexpf(x, &iexp); diff --git a/babl/base/type-float.c b/babl/base/type-float.c index 4a09f3e..ee05c37 100644 --- a/babl/base/type-float.c +++ b/babl/base/type-float.c @@ -27,11 +27,11 @@ static void convert_double_float (BablConversion *conversion, - char *src, - char *dst, - int src_pitch, - int dst_pitch, - long n) + char *src, + char *dst, + int src_pitch, + int dst_pitch, + long n) { while (n--) { @@ -43,11 +43,11 @@ convert_double_float (BablConversion *conversion, static void convert_float_double (BablConversion *conversion, - char *src, - char *dst, - int src_pitch, - int dst_pitch, - long n) + char *src, + char *dst, + int src_pitch, + int dst_pitch, + long n) { while (n--) { diff --git a/babl/base/type-half.c b/babl/base/type-half.c index d163300..edb0390 100644 --- a/babl/base/type-half.c +++ b/babl/base/type-half.c @@ -72,7 +72,10 @@ static int next = 1; /* should be 0 for big endian */ //----------------------------------------------------------------------------- -static void doubles2halfp(void *target, void *source, long numel) +static void +doubles2halfp(void *target, + 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 @@ -129,7 +132,10 @@ static void doubles2halfp(void *target, void *source, long numel) } } -static void halfp2doubles(void *target, void *source, long numel) +static void +halfp2doubles(void *target, + 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 @@ -185,7 +191,9 @@ static void halfp2doubles(void *target, void *source, long numel) static void -singles2halfp(uint16_t *hp, const uint32_t *xp, int numel) +singles2halfp(uint16_t *hp, + const uint32_t *xp, + int numel) { uint16_t hs, he, hm; @@ -262,7 +270,9 @@ singles2halfp(uint16_t *hp, const uint32_t *xp, int numel) //----------------------------------------------------------------------------- static void -halfp2singles(uint32_t *xp, const uint16_t *hp, int numel) +halfp2singles(uint32_t *xp, + const uint16_t *hp, + int numel) { uint16_t h, hs, he, hm; @@ -318,11 +328,11 @@ halfp2singles(uint32_t *xp, const uint16_t *hp, int numel) static void convert_double_half (BablConversion *conversion, - char *src, - char *dst, - int src_pitch, - int dst_pitch, - long n) + char *src, + char *dst, + int src_pitch, + int dst_pitch, + long n) { while (n--) { @@ -334,11 +344,11 @@ convert_double_half (BablConversion *conversion, static void convert_half_double (BablConversion *conversion, - char *src, - char *dst, - int src_pitch, - int dst_pitch, - long n) + char *src, + char *dst, + int src_pitch, + int dst_pitch, + long n) { while (n--) { @@ -351,11 +361,11 @@ convert_half_double (BablConversion *conversion, static void convert_float_half (BablConversion *conversion, - char *src, - char *dst, - int src_pitch, - int dst_pitch, - long n) + char *src, + char *dst, + int src_pitch, + int dst_pitch, + long n) { while (n--) { @@ -367,11 +377,11 @@ convert_float_half (BablConversion *conversion, static void convert_half_float (BablConversion *conversion, - char *src, - char *dst, - int src_pitch, - int dst_pitch, - long n) + char *src, + char *dst, + int src_pitch, + int dst_pitch, + long n) { while (n--) { diff --git a/babl/base/type-u15.c b/babl/base/type-u15.c index c3216f8..ea35453 100644 --- a/babl/base/type-u15.c +++ b/babl/base/type-u15.c @@ -60,13 +60,13 @@ static inline void convert_u15_double_scaled (BablConversion *conversion, double min_val, double max_val, - uint16_t min, - uint16_t max, - char *src, - char *dst, - int src_pitch, - int dst_pitch, - long n) + uint16_t min, + uint16_t max, + char *src, + char *dst, + int src_pitch, + int dst_pitch, + long n) { while (n--) { diff --git a/babl/base/type-u16.c b/babl/base/type-u16.c index 6841c9b..c5a41dc 100644 --- a/babl/base/type-u16.c +++ b/babl/base/type-u16.c @@ -28,15 +28,15 @@ static inline void convert_double_u16_scaled (BablConversion *conversion, - double min_val, - double max_val, - uint16_t min, - uint16_t max, - char *src, - char *dst, - int src_pitch, - int dst_pitch, - long n) + double min_val, + double max_val, + uint16_t min, + uint16_t max, + char *src, + char *dst, + int src_pitch, + int dst_pitch, + long n) { while (n--) { @@ -58,15 +58,15 @@ convert_double_u16_scaled (BablConversion *conversion, static inline void convert_u16_double_scaled (BablConversion *conversion, - double min_val, - double max_val, - uint16_t min, - uint16_t max, - char *src, - char *dst, - int src_pitch, - int dst_pitch, - long n) + double min_val, + double max_val, + uint16_t min, + uint16_t max, + char *src, + char *dst, + int src_pitch, + int dst_pitch, + long n) { while (n--) { @@ -112,15 +112,15 @@ MAKE_CONVERSIONS (u16, 0.0, 1.0, 0, UINT16_MAX) static inline void convert_float_u16_scaled (BablConversion *conversion, - double min_val, - double max_val, - uint16_t min, - uint16_t max, - char *src, - char *dst, - int src_pitch, - int dst_pitch, - long n) + double min_val, + double max_val, + uint16_t min, + uint16_t max, + char *src, + char *dst, + int src_pitch, + int dst_pitch, + long n) { while (n--) { @@ -142,15 +142,15 @@ convert_float_u16_scaled (BablConversion *conversion, static inline void convert_u16_float_scaled (BablConversion *conversion, - double min_val, - double max_val, - uint16_t min, - uint16_t max, - char *src, - char *dst, - int src_pitch, - int dst_pitch, - long n) + double min_val, + double max_val, + uint16_t min, + uint16_t max, + char *src, + char *dst, + int src_pitch, + int dst_pitch, + long n) { while (n--) { diff --git a/babl/base/type-u32.c b/babl/base/type-u32.c index 1af2233..48b1506 100644 --- a/babl/base/type-u32.c +++ b/babl/base/type-u32.c @@ -27,15 +27,15 @@ static inline void convert_double_u32_scaled (BablConversion *c, - double min_val, - double max_val, - uint32_t min, - uint32_t max, - char *src, - char *dst, - int src_pitch, - int dst_pitch, - long n) + double min_val, + double max_val, + uint32_t min, + uint32_t max, + char *src, + char *dst, + int src_pitch, + int dst_pitch, + long n) { while (n--) { @@ -57,15 +57,15 @@ convert_double_u32_scaled (BablConversion *c, static inline void convert_u32_double_scaled (BablConversion *c, - double min_val, - double max_val, - uint32_t min, - uint32_t max, - char *src, - char *dst, - int src_pitch, - int dst_pitch, - long n) + double min_val, + double max_val, + uint32_t min, + uint32_t max, + char *src, + char *dst, + int src_pitch, + int dst_pitch, + long n) { while (n--) { @@ -112,15 +112,15 @@ MAKE_CONVERSIONS (u32, 0.0, 1.0, 0, UINT32_MAX) static inline void convert_float_u32_scaled (BablConversion *c, - float min_val, - float max_val, - uint32_t min, - uint32_t max, - char *src, - char *dst, - int src_pitch, - int dst_pitch, - long n) + float min_val, + float max_val, + uint32_t min, + uint32_t max, + char *src, + char *dst, + int src_pitch, + int dst_pitch, + long n) { while (n--) { @@ -142,15 +142,15 @@ convert_float_u32_scaled (BablConversion *c, static inline void convert_u32_float_scaled (BablConversion *c, - float min_val, - float max_val, - uint32_t min, - uint32_t max, - char *src, - char *dst, - int src_pitch, - int dst_pitch, - long n) + float min_val, + float max_val, + uint32_t min, + uint32_t max, + char *src, + char *dst, + int src_pitch, + int dst_pitch, + long n) { while (n--) { diff --git a/babl/base/type-u8.c b/babl/base/type-u8.c index 2ad561b..5e55e4d 100644 --- a/babl/base/type-u8.c +++ b/babl/base/type-u8.c @@ -27,15 +27,15 @@ #include static inline void convert_double_u8_scaled (BablConversion *c, - double min_val, - double max_val, - unsigned char min, - unsigned char max, - char *src, - char *dst, - int src_pitch, - int dst_pitch, - long n) + double min_val, + double max_val, + unsigned char min, + unsigned char max, + char *src, + char *dst, + int src_pitch, + int dst_pitch, + long n) { while (n--) { @@ -57,15 +57,15 @@ convert_double_u8_scaled (BablConversion *c, static inline void convert_u8_double_scaled (BablConversion *c, - double min_val, - double max_val, - unsigned char min, - unsigned char max, - char *src, - char *dst, - int src_pitch, - int dst_pitch, - long n) + double min_val, + double max_val, + unsigned char min, + unsigned char max, + char *src, + char *dst, + int src_pitch, + int dst_pitch, + long n) { while (n--) { @@ -115,15 +115,15 @@ MAKE_CONVERSIONS (u8_chroma, -0.5, 0.5, 16, 240) static inline void convert_float_u8_scaled (BablConversion *c, - double min_val, - double max_val, - unsigned char min, - unsigned char max, - char *src, - char *dst, - int src_pitch, - int dst_pitch, - long n) + double min_val, + double max_val, + unsigned char min, + unsigned char max, + char *src, + char *dst, + int src_pitch, + int dst_pitch, + long n) { while (n--) { @@ -145,15 +145,15 @@ convert_float_u8_scaled (BablConversion *c, static inline void convert_u8_float_scaled (BablConversion *c, - double min_val, - double max_val, - unsigned char min, - unsigned char max, - char *src, - char *dst, - int src_pitch, - int dst_pitch, - long n) + double min_val, + double max_val, + unsigned char min, + unsigned char max, + char *src, + char *dst, + int src_pitch, + int dst_pitch, + long n) { while (n--) { -- 2.30.2