Update libpng from 1.6.3 to 1.6.10
Change-Id: I76e81e7fd267d15991cd342c5caeb2fe77964ebf
diff --git a/pngrio.c b/pngrio.c
index 935da9b..d75ac5b 100644
--- a/pngrio.c
+++ b/pngrio.c
@@ -1,8 +1,8 @@
/* pngrio.c - functions for data input
*
- * Last changed in libpng 1.6.0 [February 14, 2013]
- * Copyright (c) 1998-2013 Glenn Randers-Pehrson
+ * Last changed in libpng 1.6.9 [February 6, 2014]
+ * Copyright (c) 1998-2014 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.)
*
@@ -38,22 +38,8 @@
else
png_error(png_ptr, "Call to NULL read function");
-#ifdef PNG_INDEX_SUPPORTED
- png_ptr->total_data_read += length;
-#endif
}
-#ifdef PNG_INDEX_SUPPORTED
-void /* PRIVATE */
-png_seek_data(png_structp png_ptr, png_uint_32 offset)
-{
- if (png_ptr->seek_data_fn != NULL)
- (*(png_ptr->seek_data_fn))(png_ptr, offset);
- else
- png_error(png_ptr, "Call to NULL seek function");
-}
-#endif
-
#ifdef PNG_STDIO_SUPPORTED
/* This is the function that does the actual reading of data. If you are
* not reading from a standard C stream, you should create a replacement
@@ -116,6 +102,7 @@
png_ptr->read_data_fn = read_data_fn;
#endif
+#ifdef PNG_WRITE_SUPPORTED
/* It is an error to write to a read device */
if (png_ptr->write_data_fn != NULL)
{
@@ -124,20 +111,10 @@
"Can't set both read_data_fn and write_data_fn in the"
" same structure");
}
+#endif
#ifdef PNG_WRITE_FLUSH_SUPPORTED
png_ptr->output_flush_fn = NULL;
#endif
}
-
-#ifdef PNG_INDEX_SUPPORTED
-void PNGAPI
-png_set_seek_fn(png_structp png_ptr, png_seek_ptr seek_data_fn)
-{
- if (png_ptr == NULL)
- return;
- png_ptr->seek_data_fn = seek_data_fn;
-}
-#endif
-
#endif /* PNG_READ_SUPPORTED */