aboutsummaryrefslogtreecommitdiff
path: root/contrib/libtests/timepng.c
diff options
context:
space:
mode:
Diffstat (limited to 'contrib/libtests/timepng.c')
-rw-r--r--contrib/libtests/timepng.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/contrib/libtests/timepng.c b/contrib/libtests/timepng.c
index 3bcfde5a3..0093a4548 100644
--- a/contrib/libtests/timepng.c
+++ b/contrib/libtests/timepng.c
@@ -1,9 +1,8 @@
+
/* timepng.c
*
* Copyright (c) 2013,2016 John Cunningham Bowler
*
- * Last changed in libpng 1.6.22 [May 26, 2016]
- *
* This code is released under the libpng license.
* For conditions of distribution and use, see the disclaimer
* and license in png.h
@@ -65,7 +64,7 @@ typedef struct
} io_data;
static PNG_CALLBACK(void, read_and_copy,
- (png_structp png_ptr, png_bytep buffer, png_size_t cb))
+ (png_structp png_ptr, png_bytep buffer, size_t cb))
{
io_data *io = (io_data*)png_get_io_ptr(png_ptr);
@@ -100,7 +99,7 @@ static void read_by_row(png_structp png_ptr, png_infop info_ptr,
png_read_info(png_ptr, info_ptr);
{
- png_size_t rowbytes = png_get_rowbytes(png_ptr, info_ptr);
+ size_t rowbytes = png_get_rowbytes(png_ptr, info_ptr);
row = voidcast(png_bytep,malloc(rowbytes));
display = voidcast(png_bytep,malloc(rowbytes));
@@ -528,7 +527,7 @@ int main(int argc, char **argv)
}
}
- else if (nfiles == 0) /* Read from stdin withoout --dissemble */
+ else if (nfiles == 0) /* Read from stdin without --dissemble */
{
char filename[FILENAME_MAX+1];