dany/libwebp
1
0
Fork 0
mirror of https://github.com/webmproject/libwebp.git synced 2025-12-23 21:46:26 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Set alpha to 0xff in ImportYUVAFromRGBA by default

Browse Source 
Change-Id: I09d69aff23d990bf171cc0afaec0fd60e3ba9365
This commit is contained in:
Vincent Rabaud
2025-10-30 11:40:58 +01:00
parent d1e9c93961
commit 2a755e7eec
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/dsp/yuv.c
View File

@@ -15,6 +15,7 @@
#include <assert.h>
#include <stdlib.h>
#include <string.h>
#include "src/dsp/cpu.h"
#include "src/dsp/dsp.h"
@@ -547,7 +548,13 @@ static void ImportYUVAFromRGBA_C(const uint8_t* r_ptr, const uint8_t* g_ptr,
rows_have_alpha &=
!WebPExtractAlpha(a_ptr, rgb_stride, width, 2, dst_a, a_stride);
dst_a += 2 * a_stride;
} else if (dst_a != NULL) {
int i;
for (i = 0; i < 2; ++i, dst_a += a_stride) {
memset(dst_a, 0xff, width);
}
}
// Collect averaged R/G/B(/A)
if (!rows_have_alpha) {
WebPAccumulateRGB(r_ptr, g_ptr, b_ptr, step, rgb_stride, tmp_rgb, width);
@@ -583,7 +590,10 @@ static void ImportYUVAFromRGBALastLine_C(
}
if (row_has_alpha) {
row_has_alpha &= !WebPExtractAlpha(a_ptr, 0, width, 1, dst_a, 0);
} else if (dst_a != NULL) {
memset(dst_a, 0xff, width);
}
// Collect averaged R/G/B(/A)
if (!row_has_alpha) {
// Collect averaged R/G/B

1
src/dsp/yuv.h
View File

@@ -232,6 +232,7 @@ static WEBP_INLINE int VP8RGBToV(int r, int g, int b, int rounding) {
return VP8ClipUV(v, rounding);
}
// has_alpha is true if there is an alpha value that is not 0xff.
extern void (*WebPImportYUVAFromRGBA)(
const uint8_t* r_ptr, const uint8_t* g_ptr, const uint8_t* b_ptr,
const uint8_t* a_ptr,