dany/libwebp
1
0
Fork 0
mirror of https://github.com/webmproject/libwebp.git synced 2025-08-29 07:12:05 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge "Add fbounds-safety annotations for WebPRescaler." into main

Browse Source
This commit is contained in:
James Zern
2025-08-20 19:06:52 -07:00
committed by Gerrit Code Review
parent dab2cf21fa 1fdd4ef501
commit 2074cb4ba1
2 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/utils/rescaler_utils.c
View File

@@ -30,7 +30,8 @@ WEBP_ASSUME_UNSAFE_INDEXABLE_ABI
int WebPRescalerInit(WebPRescaler* const rescaler, int src_width, int WebPRescalerInit(WebPRescaler* const rescaler, int src_width,
int src_height, uint8_t* const dst, int dst_width, int src_height, uint8_t* const dst, int dst_width,
int dst_height, int dst_stride, int num_channels, int dst_height, int dst_stride, int num_channels,
rescaler_t* const work) { rescaler_t* const WEBP_COUNTED_BY(2ULL * dst_width *
num_channels) work) {
const int x_add = src_width, x_sub = dst_width; const int x_add = src_width, x_sub = dst_width;
const int y_add = src_height, y_sub = dst_height; const int y_add = src_height, y_sub = dst_height;
const uint64_t total_size = 2ull * dst_width * num_channels * sizeof(*work); const uint64_t total_size = 2ull * dst_width * num_channels * sizeof(*work);
@@ -47,6 +48,9 @@ int WebPRescalerInit(WebPRescaler* const rescaler, int src_width,
rescaler->dst = dst; rescaler->dst = dst;
rescaler->dst_stride = dst_stride; rescaler->dst_stride = dst_stride;
rescaler->num_channels = num_channels; rescaler->num_channels = num_channels;
rescaler->irow = work;
rescaler->frow = work + num_channels * dst_width;
memset(work, 0, (size_t)total_size);
// for 'x_expand', we use bilinear interpolation // for 'x_expand', we use bilinear interpolation
rescaler->x_add = rescaler->x_expand ? (x_sub - 1) : x_add; rescaler->x_add = rescaler->x_expand ? (x_sub - 1) : x_add;
@@ -79,9 +83,6 @@ int WebPRescalerInit(WebPRescaler* const rescaler, int src_width,
rescaler->fy_scale = WEBP_RESCALER_FRAC(1, rescaler->x_add); rescaler->fy_scale = WEBP_RESCALER_FRAC(1, rescaler->x_add);
// rescaler->fxy_scale is unused here. // rescaler->fxy_scale is unused here.
} }
rescaler->irow = work;
rescaler->frow = work + num_channels * dst_width;
WEBP_UNSAFE_MEMSET(work, 0, (size_t)total_size);
WebPRescalerDspInit(); WebPRescalerDspInit();
return 1; return 1;
@@ -136,7 +137,11 @@ int WebPRescalerImport(WebPRescaler* const rescaler, int num_lines,
if (rescaler->y_expand) { if (rescaler->y_expand) {
rescaler_t* const tmp = rescaler->irow; rescaler_t* const tmp = rescaler->irow;
rescaler->irow = rescaler->frow; rescaler->irow = rescaler->frow;
rescaler->frow = tmp; rescaler->frow = WEBP_UNSAFE_FORGE_BIDI_INDEXABLE(
rescaler_t*, tmp,
rescaler->num_channels * rescaler->dst_width * sizeof(*tmp));
WEBP_SELF_ASSIGN(rescaler->dst_width);
WEBP_SELF_ASSIGN(rescaler->num_channels);
} }
WebPRescalerImportRow(rescaler, src); WebPRescalerImportRow(rescaler, src);
if (!rescaler->y_expand) { // Accumulate the contribution of the new row. if (!rescaler->y_expand) { // Accumulate the contribution of the new row.

7
src/utils/rescaler_utils.h
View File

@@ -46,7 +46,9 @@ struct WebPRescaler {
int src_y, dst_y; // row counters for input and output int src_y, dst_y; // row counters for input and output
uint8_t* dst; uint8_t* dst;
int dst_stride; int dst_stride;
rescaler_t *irow, *frow; // work buffer // work buffer
rescaler_t* WEBP_COUNTED_BY(dst_width* num_channels) irow;
rescaler_t* WEBP_COUNTED_BY(dst_width* num_channels) frow;
}; };
// Initialize a rescaler given scratch area 'work' and dimensions of src & dst. // Initialize a rescaler given scratch area 'work' and dimensions of src & dst.
@@ -54,7 +56,8 @@ struct WebPRescaler {
int WebPRescalerInit(WebPRescaler* const rescaler, int src_width, int WebPRescalerInit(WebPRescaler* const rescaler, int src_width,
int src_height, uint8_t* const dst, int dst_width, int src_height, uint8_t* const dst, int dst_width,
int dst_height, int dst_stride, int num_channels, int dst_height, int dst_stride, int num_channels,
rescaler_t* const work); rescaler_t* const WEBP_COUNTED_BY(2ULL * dst_width *
num_channels) work);
// If either 'scaled_width' or 'scaled_height' (but not both) is 0 the value // If either 'scaled_width' or 'scaled_height' (but not both) is 0 the value
// will be calculated preserving the aspect ratio, otherwise the values are // will be calculated preserving the aspect ratio, otherwise the values are