Skip to content

Commit aba8a84

Browse files
committed
Core (alpha-blend): Rename size parameter of visual_alpha_blend_*() to n to mirror similar functions.
1 parent 5fe3eb1 commit aba8a84

File tree

2 files changed

+12
-13
lines changed

2 files changed

+12
-13
lines changed

libvisual/libvisual/lv_alpha_blend.c

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,31 +16,30 @@ typedef struct {
1616

1717
#pragma pack()
1818

19-
void visual_alpha_blend_8 (uint8_t *LV_RESTRICT dest, const uint8_t *LV_RESTRICT src1, const uint8_t *LV_RESTRICT src2, visual_size_t size, uint8_t alpha)
19+
void visual_alpha_blend_8 (uint8_t *LV_RESTRICT dest, const uint8_t *LV_RESTRICT src1, const uint8_t *LV_RESTRICT src2, visual_size_t n, uint8_t alpha)
2020
{
21-
simd_interpolate_8 (dest, src1, src2, alpha, (int) size);
21+
simd_interpolate_8 (dest, src1, src2, alpha, (int) n);
2222
}
2323

24-
void visual_alpha_blend_16 (uint8_t *LV_RESTRICT dest, const uint8_t *LV_RESTRICT src1, const uint8_t *LV_RESTRICT src2, visual_size_t size, uint8_t alpha)
24+
void visual_alpha_blend_16 (uint8_t *LV_RESTRICT dest, const uint8_t *LV_RESTRICT src1, const uint8_t *LV_RESTRICT src2, visual_size_t n, uint8_t alpha)
2525
{
2626
rgb16_t *destr = (rgb16_t *) dest;
2727
rgb16_t *src1r = (rgb16_t *) src1;
2828
rgb16_t *src2r = (rgb16_t *) src2;
29-
visual_size_t i;
3029

31-
for (i = 0; i < size; i++) {
30+
for (visual_size_t i = 0; i < n; i++) {
3231
destr[i].r = (alpha * (src2r[i].r - src1r[i].r)) / 255 + src1r[i].r;
3332
destr[i].g = (alpha * (src2r[i].g - src1r[i].g)) / 255 + src1r[i].g;
3433
destr[i].b = (alpha * (src2r[i].b - src1r[i].b)) / 255 + src1r[i].b;
3534
}
3635
}
3736

38-
void visual_alpha_blend_24 (uint8_t *LV_RESTRICT dest, const uint8_t *LV_RESTRICT src1, const uint8_t *LV_RESTRICT src2, visual_size_t size, uint8_t alpha)
37+
void visual_alpha_blend_24 (uint8_t *LV_RESTRICT dest, const uint8_t *LV_RESTRICT src1, const uint8_t *LV_RESTRICT src2, visual_size_t n, uint8_t alpha)
3938
{
40-
simd_interpolate_8 (dest, src1, src2, alpha, (int) size * 3);
39+
simd_interpolate_8 (dest, src1, src2, alpha, (int) n * 3);
4140
}
4241

43-
void visual_alpha_blend_32 (uint8_t *LV_RESTRICT dest, const uint8_t *LV_RESTRICT src1, const uint8_t *LV_RESTRICT src2, visual_size_t size, uint8_t alpha)
42+
void visual_alpha_blend_32 (uint8_t *LV_RESTRICT dest, const uint8_t *LV_RESTRICT src1, const uint8_t *LV_RESTRICT src2, visual_size_t n, uint8_t alpha)
4443
{
45-
simd_interpolate_8 (dest, src1, src2, alpha, (int) size * 4);
44+
simd_interpolate_8 (dest, src1, src2, alpha, (int) n * 4);
4645
}

libvisual/libvisual/lv_alpha_blend.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77

88
LV_BEGIN_DECLS
99

10-
LV_API void visual_alpha_blend_8 (uint8_t *LV_RESTRICT dest, const uint8_t *LV_RESTRICT src1, const uint8_t *LV_RESTRICT src2, visual_size_t size, uint8_t alpha);
11-
LV_API void visual_alpha_blend_16 (uint8_t *LV_RESTRICT dest, const uint8_t *LV_RESTRICT src1, const uint8_t *LV_RESTRICT src2, visual_size_t size, uint8_t alpha);
12-
LV_API void visual_alpha_blend_24 (uint8_t *LV_RESTRICT dest, const uint8_t *LV_RESTRICT src1, const uint8_t *LV_RESTRICT src2, visual_size_t size, uint8_t alpha);
13-
LV_API void visual_alpha_blend_32 (uint8_t *LV_RESTRICT dest, const uint8_t *LV_RESTRICT src1, const uint8_t *LV_RESTRICT src2, visual_size_t size, uint8_t alpha);
10+
LV_API void visual_alpha_blend_8 (uint8_t *LV_RESTRICT dest, const uint8_t *LV_RESTRICT src1, const uint8_t *LV_RESTRICT src2, visual_size_t n, uint8_t alpha);
11+
LV_API void visual_alpha_blend_16 (uint8_t *LV_RESTRICT dest, const uint8_t *LV_RESTRICT src1, const uint8_t *LV_RESTRICT src2, visual_size_t n, uint8_t alpha);
12+
LV_API void visual_alpha_blend_24 (uint8_t *LV_RESTRICT dest, const uint8_t *LV_RESTRICT src1, const uint8_t *LV_RESTRICT src2, visual_size_t n, uint8_t alpha);
13+
LV_API void visual_alpha_blend_32 (uint8_t *LV_RESTRICT dest, const uint8_t *LV_RESTRICT src1, const uint8_t *LV_RESTRICT src2, visual_size_t n, uint8_t alpha);
1414

1515
LV_END_DECLS
1616

0 commit comments

Comments
 (0)