dany/libwebp
1
0
Fork 0
mirror of https://github.com/webmproject/libwebp.git synced 2025-04-03 23:46:49 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix errors when compiling code as C++

Browse Source 
Change-Id: Iba94e24e764038640f39d61fb2bc9cfb3434cc8f
This commit is contained in:
Vincent Rabaud 2024-07-10 10:30:48 +02:00
parent c1c89f5189
commit 41a5e582c2
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sharpyuv/sharpyuv.c
View File

@ -565,10 +565,11 @@ int SharpYuvConvertWithOptions(const void* r_ptr, const void* g_ptr,
scaled_matrix.rgb_to_u[3] = Shift(yuv_matrix->rgb_to_u[3], sfix); scaled_matrix.rgb_to_u[3] = Shift(yuv_matrix->rgb_to_u[3], sfix);
scaled_matrix.rgb_to_v[3] = Shift(yuv_matrix->rgb_to_v[3], sfix); scaled_matrix.rgb_to_v[3] = Shift(yuv_matrix->rgb_to_v[3], sfix);
return DoSharpArgbToYuv(r_ptr, g_ptr, b_ptr, rgb_step, rgb_stride, return DoSharpArgbToYuv(
rgb_bit_depth, y_ptr, y_stride, u_ptr, u_stride, (const uint8_t*)r_ptr, (const uint8_t*)g_ptr, (const uint8_t*)b_ptr,
v_ptr, v_stride, yuv_bit_depth, width, height, rgb_step, rgb_stride, rgb_bit_depth, (uint8_t*)y_ptr, y_stride,
&scaled_matrix, transfer_type); (uint8_t*)u_ptr, u_stride, (uint8_t*)v_ptr, v_stride, yuv_bit_depth,
width, height, &scaled_matrix, transfer_type);
} }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------

2
src/enc/histogram_enc.c
View File

@ -1195,7 +1195,7 @@ int VP8LGetHistoImageSymbols(int xsize, int ysize,
const int entropy_combine_num_bins = low_effort ? NUM_PARTITIONS : BIN_SIZE; const int entropy_combine_num_bins = low_effort ? NUM_PARTITIONS : BIN_SIZE;
int entropy_combine; int entropy_combine;
uint16_t* const map_tmp = uint16_t* const map_tmp =
WebPSafeMalloc(2 * image_histo_raw_size, sizeof(*map_tmp)); (uint16_t*)WebPSafeMalloc(2 * image_histo_raw_size, sizeof(*map_tmp));
uint16_t* const cluster_mappings = map_tmp + image_histo_raw_size; uint16_t* const cluster_mappings = map_tmp + image_histo_raw_size;
int num_used = image_histo_raw_size; int num_used = image_histo_raw_size;
if (orig_histo == NULL || map_tmp == NULL) { if (orig_histo == NULL || map_tmp == NULL) {

6
src/enc/vp8l_enc.c
View File

@ -1412,9 +1412,9 @@ static int MapImageFromPalette(VP8LEncoder* const enc) {
} }
// Save palette_[] to bitstream. // Save palette_[] to bitstream.
static WebPEncodingError EncodePalette(VP8LBitWriter* const bw, int low_effort, static int EncodePalette(VP8LBitWriter* const bw, int low_effort,
VP8LEncoder* const enc, VP8LEncoder* const enc, int percent_range,
int percent_range, int* const percent) { int* const percent) {
int i; int i;
uint32_t tmp_palette[MAX_PALETTE_SIZE]; uint32_t tmp_palette[MAX_PALETTE_SIZE];
const int palette_size = enc->palette_size_; const int palette_size = enc->palette_size_;