sergiotarxz/libvips
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1935 from lovell/webpload-blend-pixel-prevent-div-zero

Browse Source 
webpload: prevent divide-by-zero when blending pixels
This commit is contained in:
John Cupitt 2020-12-18 10:08:07 +00:00 committed by GitHub
commit 787c4ebd88
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libvips/foreign/webp2vips.c
View File

@ -260,9 +260,9 @@ blend_pixel( guint32 A, guint32 B )
guint8 aB = getA( B );
guint8 fac = (aB * (256 - aA) + 128) >> 8;
guint8 fac = (aB * (255 - aA) + 127) >> 8;
guint8 aR = aA + fac;
int scale = (1 << 24) / aR;
int scale = aR == 0 ? 0 : (1 << 24) / aR;
guint8 rR = BLEND( getR( A ), aA, getR( B ), fac, scale );
guint8 gR = BLEND( getG( A ), aA, getG( B ), fac, scale );

1
test/test-suite/helpers/helpers.py
View File

@ -22,6 +22,7 @@ ANALYZE_FILE = os.path.join(IMAGES, "t00740_tr1_segm.hdr")
GIF_FILE = os.path.join(IMAGES, "cramps.gif")
WEBP_FILE = os.path.join(IMAGES, "1.webp")
WEBP_LOOKS_LIKE_SVG_FILE = os.path.join(IMAGES, "looks-like-svg.webp")
WEBP_ANIMATED_FILE = os.path.join(IMAGES, "big-height.webp")
EXR_FILE = os.path.join(IMAGES, "sample.exr")
FITS_FILE = os.path.join(IMAGES, "WFPC2u5780205r_c0fx.fits")
OPENSLIDE_FILE = os.path.join(IMAGES, "CMU-1-Small-Region.svs")

BIN
test/test-suite/images/big-height.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.1 KiB

10
test/test-suite/test_foreign.py
View File

@ -17,8 +17,8 @@ from helpers import \
GIF_ANIM_DISPOSE_PREVIOUS_FILE, \
GIF_ANIM_DISPOSE_PREVIOUS_EXPECTED_PNG_FILE, \
temp_filename, assert_almost_equal_objects, have, skip_if_no, \
TIF1_FILE, TIF2_FILE, TIF4_FILE, WEBP_LOOKS_LIKE_SVG_FILE
TIF1_FILE, TIF2_FILE, TIF4_FILE, WEBP_LOOKS_LIKE_SVG_FILE, \
WEBP_ANIMATED_FILE
class TestForeign:
tempdir = None
@ -694,6 +694,12 @@ class TestForeign:
x = pyvips.Image.new_from_file(WEBP_LOOKS_LIKE_SVG_FILE)
assert x.get("vips-loader") == "webpload"
# Animated WebP roundtrip
x = pyvips.Image.new_from_file(WEBP_ANIMATED_FILE, n=-1)
assert x.width == 13
assert x.height == 16393
buf = x.webpsave_buffer()
@skip_if_no("analyzeload")
def test_analyzeload(self):
def analyze_valid(im):