summaryrefslogtreecommitdiffstats
path: root/thirdparty/libpng/pngwrite.c
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2018-07-28 10:56:24 +0200
committerRémi Verschelde <rverschelde@gmail.com>2018-07-28 10:57:14 +0200
commitf4e682d7171b0ccf89ffc2d1e9bab084209fdfd0 (patch)
tree4ab829b564c5fd4fcf5256d4ec77c4683ff96fe1 /thirdparty/libpng/pngwrite.c
parent4e4702e3868af342b0e2964c7753fa4a3aa83af8 (diff)
downloadredot-engine-f4e682d7171b0ccf89ffc2d1e9bab084209fdfd0.tar.gz
libpng: Update to upstream version 1.6.35
Diffstat (limited to 'thirdparty/libpng/pngwrite.c')
-rw-r--r--thirdparty/libpng/pngwrite.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/thirdparty/libpng/pngwrite.c b/thirdparty/libpng/pngwrite.c
index a16d77ce00..5bd87f373e 100644
--- a/thirdparty/libpng/pngwrite.c
+++ b/thirdparty/libpng/pngwrite.c
@@ -1,8 +1,8 @@
/* pngwrite.c - general routines to write a PNG file
*
- * Last changed in libpng 1.6.32 [August 24, 2017]
- * Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson
+ * Last changed in libpng 1.6.35 [July 15, 2018]
+ * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
*
@@ -1636,7 +1636,7 @@ png_write_image_16bit(png_voidp argument)
* calculation can be done to 15 bits of accuracy; however, the output needs to
* be scaled in the range 0..255*65535, so include that scaling here.
*/
-# define UNP_RECIPROCAL(alpha) ((((0xffff*0xff)<<7)+(alpha>>1))/alpha)
+# define UNP_RECIPROCAL(alpha) ((((0xffff*0xff)<<7)+((alpha)>>1))/(alpha))
static png_byte
png_unpremultiply(png_uint_32 component, png_uint_32 alpha,
@@ -2162,8 +2162,7 @@ png_image_write_main(png_voidp argument)
static void (PNGCBAPI
-image_memory_write)(png_structp png_ptr, png_bytep/*const*/ data,
- png_size_t size)
+image_memory_write)(png_structp png_ptr, png_bytep/*const*/ data, size_t size)
{
png_image_write_control *display = png_voidcast(png_image_write_control*,
png_ptr->io_ptr/*backdoor: png_get_io_ptr(png_ptr)*/);