summaryrefslogtreecommitdiff
path: root/Build/source/libs/libpng/libpng-src/pngtrans.c
diff options
context:
space:
mode:
authorAkira Kakuto <kakuto@fuk.kindai.ac.jp>2016-10-20 06:03:07 +0000
committerAkira Kakuto <kakuto@fuk.kindai.ac.jp>2016-10-20 06:03:07 +0000
commit34250b2e3ede4213a43893839b8dd083619df232 (patch)
tree495e2318579c57b5d56364b635177ba3e1f6a8df /Build/source/libs/libpng/libpng-src/pngtrans.c
parentf2301b10f959f2fd3dde3223e6bd50c7ae1ee09a (diff)
libpng 1.6.26
git-svn-id: svn://tug.org/texlive/trunk@42309 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/libpng/libpng-src/pngtrans.c')
-rw-r--r--Build/source/libs/libpng/libpng-src/pngtrans.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/Build/source/libs/libpng/libpng-src/pngtrans.c b/Build/source/libs/libpng/libpng-src/pngtrans.c
index e5cbd79b9d2..da7413fb809 100644
--- a/Build/source/libs/libpng/libpng-src/pngtrans.c
+++ b/Build/source/libs/libpng/libpng-src/pngtrans.c
@@ -1,7 +1,7 @@
/* pngtrans.c - transforms the data in a row (used by both readers and writers)
*
- * Last changed in libpng 1.6.24 [August 4, 2016]
+ * Last changed in libpng 1.6.26 [October 20, 2016]
* Copyright (c) 1998-2002,2004,2006-2016 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.)
@@ -595,7 +595,7 @@ png_do_strip_channel(png_row_infop row_info, png_bytep row, int at_start)
return; /* The filler channel has gone already */
/* Fix the rowbytes value. */
- row_info->rowbytes = dp-row;
+ row_info->rowbytes = (unsigned int)(dp-row);
}
#endif
@@ -693,7 +693,7 @@ png_do_check_palette_indexes(png_structrp png_ptr, png_row_infop row_info)
* and this calculation is used because it avoids warnings that other
* forms produced on either GCC or MSVC.
*/
- int padding = (-row_info->pixel_depth * row_info->width) & 7;
+ int padding = PNG_PADBITS(row_info->pixel_depth, row_info->width);
png_bytep rp = png_ptr->row_buf + row_info->rowbytes;
switch (row_info->bit_depth)