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

fuzz_utils.h: rename max() to Max()

Browse Source 
avoids conflict with windows.h define

Bug: webp:409
Change-Id: I8ae0947365e7071d8ebe1d682c9211882cc2fd89
This commit is contained in:
James Zern 2020-10-17 16:40:58 -07:00
parent 695788e7f5
commit 9f6055fcb2
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/fuzzer/fuzz_utils.h
View File

@ -169,7 +169,7 @@ static WEBP_INLINE int ExtractSourcePicture(WebPPicture* const pic,
//------------------------------------------------------------------------------
static WEBP_INLINE int max(int a, int b) { return ((a < b) ? b : a); }
static WEBP_INLINE int Max(int a, int b) { return ((a < b) ? b : a); }
static WEBP_INLINE int ExtractAndCropOrScale(WebPPicture* const pic,
const uint8_t data[], size_t size,
@ -184,8 +184,8 @@ static WEBP_INLINE int ExtractAndCropOrScale(WebPPicture* const pic,
if (crop_or_scale) {
const uint32_t left_ratio = 1 + Extract(7, data, size, bit_pos);
const uint32_t top_ratio = 1 + Extract(7, data, size, bit_pos);
const int cropped_width = max(1, pic->width / width_ratio);
const int cropped_height = max(1, pic->height / height_ratio);
const int cropped_width = Max(1, pic->width / width_ratio);
const int cropped_height = Max(1, pic->height / height_ratio);
const int cropped_left = (pic->width - cropped_width) / left_ratio;
const int cropped_top = (pic->height - cropped_height) / top_ratio;
return WebPPictureCrop(pic, cropped_left, cropped_top, cropped_width,