Skip to content

Commit 55e06ac

Browse files
kleisaukekleisauke
authored
clang-tidy: avoid narrowing conversions (#4415)
Found with clang-tidy 19.1.7.
1 parent 8effeb9 commit 55e06ac

27 files changed

+148
-148
lines changed

‎libvips/colour/HSV2sRGB.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ vips_HSV2sRGB_line(VipsColour *colour, VipsPel *out, VipsPel **in, int width)
6363
float c, x, m;
6464

6565
c = p[2] * p[1] / 255.0;
66-
x = c * (1 - fabs(fmod(p[0] / SIXTH_OF_CHAR, 2) - 1));
66+
x = c * (1 - fabsf(fmodf(p[0] / SIXTH_OF_CHAR, 2) - 1));
6767
m = p[2] - c;
6868

6969
if (p[0] < (int) SIXTH_OF_CHAR) {

‎libvips/colour/LCh2Lab.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ G_DEFINE_TYPE(VipsLCh2Lab, vips_LCh2Lab, VIPS_TYPE_COLOUR_TRANSFORM);
6969
void
7070
vips_col_Ch2ab(float C, float h, float *a, float *b)
7171
{
72-
*a = C * cos(VIPS_RAD(h));
73-
*b = C * sin(VIPS_RAD(h));
72+
*a = C * cosf(VIPS_RAD(h));
73+
*b = C * sinf(VIPS_RAD(h));
7474
}
7575

7676
/* Process a buffer of data.

‎libvips/colour/LCh2UCS.c

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,9 @@ vips_col_L2Lcmc(float L)
9292
float Lcmc;
9393

9494
if (L < 16.0)
95-
Lcmc = 1.744 * L;
95+
Lcmc = 1.744F * L;
9696
else
97-
Lcmc = 21.75 * log(L) + 0.3838 * L - 38.54;
97+
Lcmc = 21.75F * logf(L) + 0.3838F * L - 38.54F;
9898

9999
return Lcmc;
100100
}
@@ -112,7 +112,7 @@ vips_col_C2Ccmc(float C)
112112
{
113113
float Ccmc;
114114

115-
Ccmc = 0.162 * C + 10.92 * log(0.638 + 0.07216 * C) + 4.907;
115+
Ccmc = 0.162F * C + 10.92F * logf(0.638F + 0.07216F * C) + 4.907F;
116116
if (Ccmc < 0)
117117
Ccmc = 0;
118118

@@ -136,35 +136,35 @@ vips_col_Ch2hcmc(float C, float h)
136136
float hcmc;
137137

138138
if (h < 49.1) {
139-
k4 = 133.87;
140-
k5 = -134.5;
141-
k6 = -.924;
142-
k7 = 1.727;
143-
k8 = 340.0;
139+
k4 = 133.87F;
140+
k5 = -134.5F;
141+
k6 = -.924F;
142+
k7 = 1.727F;
143+
k8 = 340.0F;
144144
}
145145
else if (h < 110.1) {
146-
k4 = 11.78;
147-
k5 = -12.7;
148-
k6 = -.218;
149-
k7 = 2.12;
150-
k8 = 333.0;
146+
k4 = 11.78F;
147+
k5 = -12.7F;
148+
k6 = -.218F;
149+
k7 = 2.12F;
150+
k8 = 333.0F;
151151
}
152152
else if (h < 269.6) {
153-
k4 = 13.87;
154-
k5 = 10.93;
155-
k6 = 0.14;
156-
k7 = 1.0;
157-
k8 = -83.0;
153+
k4 = 13.87F;
154+
k5 = 10.93F;
155+
k6 = 0.14F;
156+
k7 = 1.0F;
157+
k8 = -83.0F;
158158
}
159159
else {
160-
k4 = .14;
161-
k5 = 5.23;
162-
k6 = .17;
163-
k7 = 1.61;
164-
k8 = 233.0;
160+
k4 = .14F;
161+
k5 = 5.23F;
162+
k6 = .17F;
163+
k7 = 1.61F;
164+
k8 = 233.0F;
165165
}
166166

167-
P = cos(VIPS_RAD(k7 * h + k8));
167+
P = cosf(VIPS_RAD(k7 * h + k8));
168168
D = k4 + k5 * P * powf(fabsf(P), k6);
169169
g = C * C * C * C;
170170
f = sqrtf(g / (g + 1900.0F));

‎libvips/colour/Lab2LCh.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ void
9292
vips_col_ab2Ch(float a, float b, float *C, float *h)
9393
{
9494
*h = vips_col_ab2h(a, b);
95-
*C = hypot(a, b);
95+
*C = hypotf(a, b);
9696
}
9797

9898
static void
@@ -111,7 +111,7 @@ vips_Lab2LCh_line(VipsColour *colour, VipsPel *out, VipsPel **in, int width)
111111

112112
p += 3;
113113

114-
C = sqrt(a * a + b * b);
114+
C = sqrtf(a * a + b * b);
115115
h = vips_col_ab2h(a, b);
116116

117117
q[0] = L;

‎libvips/colour/Lab2LabQ.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,14 +102,14 @@ vips_Lab2LabQ_line(VipsColour *colour, VipsPel *out, VipsPel **in, int width)
102102
lsbs = (intv & 0x3) << 6; /* 00000011 -> 11000000 */
103103
q[0] = intv >> 2; /* drop bot 2 bits and store */
104104

105-
fval = 8.0 * p[1]; /* do a */
106-
intv = rint(fval);
105+
fval = 8.0F * p[1]; /* do a */
106+
intv = rintf(fval);
107107
intv = VIPS_CLIP(-1024, intv, 1023);
108108
lsbs |= (intv & 0x7) << 3; /* 00000111 -> 00111000 */
109109
q[1] = intv >> 3; /* drop bot 3 bits & store */
110110

111-
fval = 8.0 * p[2]; /* do b */
112-
intv = rint(fval);
111+
fval = 8.0F * p[2]; /* do b */
112+
intv = rintf(fval);
113113
intv = VIPS_CLIP(-1024, intv, 1023);
114114
lsbs |= (intv & 0x7);
115115
q[2] = intv >> 3;

‎libvips/colour/LabQ2Lab.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,17 +92,17 @@ vips_LabQ2Lab_line(VipsColour *colour, VipsPel *out, VipsPel **in, int width)
9292
*/
9393
l = ((unsigned char *) p)[0];
9494
l = (l << 2) | (lsbs >> 6);
95-
q[0] = (float) l * (100.0 / 1023.0);
95+
q[0] = (float) l * (100.0F / 1023.0F);
9696

9797
/* Build a.
9898
*/
9999
l = VIPS_LSHIFT_INT(p[1], 3) | ((lsbs >> 3) & 0x7);
100-
q[1] = (float) l * 0.125;
100+
q[1] = (float) l * 0.125F;
101101

102102
/* And b.
103103
*/
104104
l = VIPS_LSHIFT_INT(p[2], 3) | (lsbs & 0x7);
105-
q[2] = (float) l * 0.125;
105+
q[2] = (float) l * 0.125F;
106106

107107
p += 4;
108108
q += 3;

‎libvips/colour/LabQ2sRGB.c

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -136,11 +136,11 @@ calcul_tables(int range, int *Y2v, float *v2Y)
136136
float v;
137137

138138
if (f <= 0.0031308)
139-
v = 12.92 * f;
139+
v = 12.92F * f;
140140
else
141-
v = (1.0 + 0.055) * pow(f, 1.0 / 2.4) - 0.055;
141+
v = (1.0F + 0.055F) * powf(f, 1.0F / 2.4F) - 0.055F;
142142

143-
Y2v[i] = rint((range - 1) * v);
143+
Y2v[i] = rintf((range - 1) * v);
144144
}
145145

146146
/* Copy the final element. This is used in the piecewise linear
@@ -152,9 +152,9 @@ calcul_tables(int range, int *Y2v, float *v2Y)
152152
float f = (float) i / (range - 1);
153153

154154
if (f <= 0.04045)
155-
v2Y[i] = f / 12.92;
155+
v2Y[i] = f / 12.92F;
156156
else
157-
v2Y[i] = pow((f + 0.055) / (1 + 0.055), 2.4);
157+
v2Y[i] = powf((f + 0.055F) / (1 + 0.055F), 2.4F);
158158
}
159159
}
160160

@@ -231,15 +231,15 @@ vips_col_scRGB2XYZ(float R, float G, float B, float *X, float *Y, float *Z)
231231
G *= SCALE;
232232
B *= SCALE;
233233

234-
*X = 0.4124 * R +
235-
0.3576 * G +
236-
0.1805 * B;
237-
*Y = 0.2126 * R +
238-
0.7152 * G +
239-
0.0722 * B;
240-
*Z = 0.0193 * R +
241-
0.1192 * G +
242-
0.9505 * B;
234+
*X = 0.4124F * R +
235+
0.3576F * G +
236+
0.1805F * B;
237+
*Y = 0.2126F * R +
238+
0.7152F * G +
239+
0.0722F * B;
240+
*Z = 0.0193F * R +
241+
0.1192F * G +
242+
0.9505F * B;
243243

244244
return 0;
245245
}
@@ -266,15 +266,15 @@ vips_col_XYZ2scRGB(float X, float Y, float Z, float *R, float *G, float *B)
266266

267267
/* Use 6 decimal places of precision for the inverse matrix.
268268
*/
269-
*R = 3.240625 * X +
270-
-1.537208 * Y +
271-
-0.498629 * Z;
272-
*G = -0.968931 * X +
273-
1.875756 * Y +
274-
0.041518 * Z;
275-
*B = 0.055710 * X +
276-
-0.204021 * Y +
277-
1.056996 * Z;
269+
*R = 3.240625F * X +
270+
-1.537208F * Y +
271+
-0.498629F * Z;
272+
*G = -0.968931F * X +
273+
1.875756F * Y +
274+
0.041518F * Z;
275+
*B = 0.055710F * X +
276+
-0.204021F * Y +
277+
1.056996F * Z;
278278

279279
return 0;
280280
}
@@ -337,19 +337,19 @@ vips_col_scRGB2sRGB(int range, int *lut,
337337
CLIP(0, Yf, maxval);
338338
Yi = (int) Yf;
339339
v = lut[Yi] + (lut[Yi + 1] - lut[Yi]) * (Yf - Yi);
340-
*r = rint(v);
340+
*r = rintf(v);
341341

342342
Yf = G * maxval;
343343
CLIP(0, Yf, maxval);
344344
Yi = (int) Yf;
345345
v = lut[Yi] + (lut[Yi + 1] - lut[Yi]) * (Yf - Yi);
346-
*g = rint(v);
346+
*g = rintf(v);
347347

348348
Yf = B * maxval;
349349
CLIP(0, Yf, maxval);
350350
Yi = (int) Yf;
351351
v = lut[Yi] + (lut[Yi + 1] - lut[Yi]) * (Yf - Yi);
352-
*b = rint(v);
352+
*b = rintf(v);
353353

354354
if (og_ret)
355355
*og_ret = og;
@@ -394,7 +394,7 @@ vips_col_scRGB2BW(int range, int *lut, float R, float G, float B,
394394

395395
/* CIE linear luminance function, see https://en.wikipedia.org/wiki/Grayscale#Colorimetric_(perceptual_luminance-preserving)_conversion_to_grayscale
396396
*/
397-
Y = 0.2126 * R + 0.7152 * G + 0.0722 * B;
397+
Y = 0.2126F * R + 0.7152F * G + 0.0722F * B;
398398

399399
/* Y can be Nan. Throw those values out, they will break
400400
* our clipping.
@@ -417,7 +417,7 @@ vips_col_scRGB2BW(int range, int *lut, float R, float G, float B,
417417
CLIP(0, Yf, maxval);
418418
Yi = (int) Yf;
419419
v = lut[Yi] + (lut[Yi + 1] - lut[Yi]) * (Yf - Yi);
420-
*g = rint(v);
420+
*g = rintf(v);
421421

422422
if (og_ret)
423423
*og_ret = og;
@@ -454,7 +454,7 @@ build_tables(void *client)
454454
for (b = 0; b < 64; b++) {
455455
/* Scale to lab space.
456456
*/
457-
float L = (l << 2) * (100.0 / 256.0);
457+
float L = (l << 2) * (100.0F / 256.0F);
458458
float A = (signed char) (a << 2);
459459
float B = (signed char) (b << 2);
460460
float X, Y, Z;

‎libvips/colour/UCS2LCh.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ vips_col_Lcmc2L(float Lcmc)
155155
known = VIPS_CLIP(0, known, 999);
156156

157157
return LI[known] +
158-
(LI[known + 1] - LI[known]) * (Lcmc * 10.0 - known);
158+
(LI[known + 1] - LI[known]) * (Lcmc * 10.0F - known);
159159
}
160160

161161
/**
@@ -177,7 +177,7 @@ vips_col_Ccmc2C(float Ccmc)
177177
known = VIPS_CLIP(0, known, 2999);
178178

179179
return CI[known] +
180-
(CI[known + 1] - CI[known]) * (Ccmc * 10.0 - known);
180+
(CI[known + 1] - CI[known]) * (Ccmc * 10.0F - known);
181181
}
182182

183183
/**

‎libvips/colour/XYZ2Lab.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,9 @@ table_init(void *client)
9797
float Y = (double) i / QUANT_ELEMENTS;
9898

9999
if (Y < 0.008856)
100-
cbrt_table[i] = 7.787 * Y + (16.0 / 116.0);
100+
cbrt_table[i] = 7.787F * Y + (16.0F / 116.0F);
101101
else
102-
cbrt_table[i] = cbrt(Y);
102+
cbrt_table[i] = cbrtf(Y);
103103
}
104104

105105
return NULL;
@@ -132,9 +132,9 @@ vips_col_XYZ2Lab_helper(VipsXYZ2Lab *XYZ2Lab,
132132
f = nZ - i;
133133
cbz = cbrt_table[i] + f * (cbrt_table[i + 1] - cbrt_table[i]);
134134

135-
*L = 116.0 * cby - 16.0;
136-
*a = 500.0 * (cbx - cby);
137-
*b = 200.0 * (cby - cbz);
135+
*L = 116.0F * cby - 16.0F;
136+
*a = 500.0F * (cbx - cby);
137+
*b = 200.0F * (cby - cbz);
138138
}
139139

140140
/* Process a buffer of data.

‎libvips/colour/Yxy2XYZ.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,11 +73,11 @@ vips_Yxy2XYZ_line(VipsColour *colour, VipsPel *out, VipsPel **in, int width)
7373

7474
if (x == 0.0 ||
7575
y == 0.0) {
76-
X = 0.0;
77-
Z = 0.0;
76+
X = 0.0F;
77+
Z = 0.0F;
7878
}
7979
else {
80-
double total;
80+
float total;
8181

8282
total = Y / y;
8383
X = x * total;

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy