Merging r6145 through r6171 from trunk to ogl-es branch

[irrlicht.git] / source / Irrlicht / libpng / pngrio.c

diff --git a/source/Irrlicht/libpng/pngrio.c b/source/Irrlicht/libpng/pngrio.c
index 99cb571588d1f951929c914fdfcf6de388983e3b..7d30c7a5186774ab5c99ffa49512c282037db112 100644 (file)
--- a/source/Irrlicht/libpng/pngrio.c
+++ b/source/Irrlicht/libpng/pngrio.c
@@ -1,10 +1,10 @@
 \r
 /* pngrio.c - functions for data input\r
  *\r
- * Last changed in libpng 1.6.17 [March 26, 2015]\r
- * Copyright (c) 1998-2002,2004,2006-2015 Glenn Randers-Pehrson\r
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)\r
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)\r
+ * Copyright (c) 2018 Cosmin Truta\r
+ * Copyright (c) 1998-2002,2004,2006-2016,2018 Glenn Randers-Pehrson\r
+ * Copyright (c) 1996-1997 Andreas Dilger\r
+ * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.\r
  *\r
  * This code is released under the libpng license.\r
  * For conditions of distribution and use, see the disclaimer\r
@@ -29,7 +29,7 @@
  * to read more than 64K on a 16-bit machine.\r
  */\r
 void /* PRIVATE */\r
-png_read_data(png_structrp png_ptr, png_bytep data, png_size_t length)\r
+png_read_data(png_structrp png_ptr, png_bytep data, size_t length)\r
 {\r
    png_debug1(4, "reading %d bytes", (int)length);\r
 \r
@@ -47,14 +47,14 @@ png_read_data(png_structrp png_ptr, png_bytep data, png_size_t length)
  * than changing the library.\r
  */\r
 void PNGCBAPI\r
-png_default_read_data(png_structp png_ptr, png_bytep data, png_size_t length)\r
+png_default_read_data(png_structp png_ptr, png_bytep data, size_t length)\r
 {\r
-   png_size_t check;\r
+   size_t check;\r
 \r
    if (png_ptr == NULL)\r
       return;\r
 \r
-   /* fread() returns 0 on error, so it is OK to store this in a png_size_t\r
+   /* fread() returns 0 on error, so it is OK to store this in a size_t\r
     * instead of an int, which is what fread() actually returns.\r
     */\r
    check = fread(data, 1, length, png_voidcast(png_FILE_p, png_ptr->io_ptr));\r
@@ -85,7 +85,7 @@ png_default_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
  */\r
 void PNGAPI\r
 png_set_read_fn(png_structrp png_ptr, png_voidp io_ptr,\r
-   png_rw_ptr read_data_fn)\r
+    png_rw_ptr read_data_fn)\r
 {\r
    if (png_ptr == NULL)\r
       return;\r