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

Merge "predictor_enc: fix build w/--disable-near-lossless"

Browse Source
This commit is contained in:
James Zern 2017-11-23 01:02:59 +00:00 committed by Gerrit Code Review
commit 541179a9a5
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/enc/predictor_enc.c
View File

@ -261,6 +261,8 @@ static WEBP_INLINE void GetResidual(
// x is never 0 here so we do not need to update upper_row like below. // x is never 0 here so we do not need to update upper_row like below.
} }
#else #else
(void)max_diffs;
(void)height;
(void)max_quantization; (void)max_quantization;
(void)used_subtract_green; (void)used_subtract_green;
residual = VP8LSubPixels(current_row[x], predict); residual = VP8LSubPixels(current_row[x], predict);
@ -324,9 +326,7 @@ static int GetBestPredictorForTile(int width, int height,
// when at the right edge. // when at the right edge.
uint32_t* upper_row = argb_scratch; uint32_t* upper_row = argb_scratch;
uint32_t* current_row = upper_row + width + 1; uint32_t* current_row = upper_row + width + 1;
#if (WEBP_NEAR_LOSSLESS == 1)
uint8_t* const max_diffs = (uint8_t*)(current_row + width + 1); uint8_t* const max_diffs = (uint8_t*)(current_row + width + 1);
#endif
float best_diff = MAX_DIFF_COST; float best_diff = MAX_DIFF_COST;
int best_mode = 0; int best_mode = 0;
int mode; int mode;
@ -420,8 +420,8 @@ static void CopyImageWithPrediction(int width, int height,
// when at the right edge. // when at the right edge.
uint32_t* upper_row = argb_scratch; uint32_t* upper_row = argb_scratch;
uint32_t* current_row = upper_row + width + 1; uint32_t* current_row = upper_row + width + 1;
#if (WEBP_NEAR_LOSSLESS == 1)
uint8_t* current_max_diffs = (uint8_t*)(current_row + width + 1); uint8_t* current_max_diffs = (uint8_t*)(current_row + width + 1);
#if (WEBP_NEAR_LOSSLESS == 1)
uint8_t* lower_max_diffs = current_max_diffs + width; uint8_t* lower_max_diffs = current_max_diffs + width;
#endif #endif
int y; int y;