| Index: third_party/libpng/pngrio.c
|
| ===================================================================
|
| --- third_party/libpng/pngrio.c (revision 7204)
|
| +++ third_party/libpng/pngrio.c (working copy)
|
| @@ -1,9 +1,9 @@
|
|
|
| /* pngrio.c - functions for data input
|
| *
|
| - * Last changed in libpng 1.2.13 November 13, 2006
|
| + * Last changed in libpng 1.2.30 [August 15, 2008]
|
| * For conditions of distribution and use, see copyright notice in png.h
|
| - * Copyright (c) 1998-2006 Glenn Randers-Pehrson
|
| + * Copyright (c) 1998-2008 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.)
|
| *
|
| @@ -17,7 +17,6 @@
|
|
|
| #define PNG_INTERNAL
|
| #include "png.h"
|
| -
|
| #if defined(PNG_READ_SUPPORTED)
|
|
|
| /* Read the data from whatever input you are using. The default routine
|
| @@ -28,7 +27,7 @@
|
| void /* PRIVATE */
|
| png_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
|
| {
|
| - png_debug1(4,"reading %d bytes\n", (int)length);
|
| + png_debug1(4, "reading %d bytes\n", (int)length);
|
| if (png_ptr->read_data_fn != NULL)
|
| (*(png_ptr->read_data_fn))(png_ptr, data, length);
|
| else
|
| @@ -46,7 +45,7 @@
|
| {
|
| png_size_t check;
|
|
|
| - if(png_ptr == NULL) return;
|
| + if (png_ptr == NULL) return;
|
| /* fread() returns 0 on error, so it is OK to store this in a png_size_t
|
| * instead of an int, which is what fread() actually returns.
|
| */
|
| @@ -77,7 +76,7 @@
|
| png_byte *n_data;
|
| png_FILE_p io_ptr;
|
|
|
| - if(png_ptr == NULL) return;
|
| + if (png_ptr == NULL) return;
|
| /* Check if data really is near. If so, use usual code. */
|
| n_data = (png_byte *)CVT_PTR_NOCHECK(data);
|
| io_ptr = (png_FILE_p)CVT_PTR(png_ptr->io_ptr);
|
| @@ -106,7 +105,7 @@
|
| err = fread(buf, (png_size_t)1, read, io_ptr);
|
| #endif
|
| png_memcpy(data, buf, read); /* copy far buffer to near buffer */
|
| - if(err != read)
|
| + if (err != read)
|
| break;
|
| else
|
| check += err;
|
| @@ -138,7 +137,7 @@
|
| png_set_read_fn(png_structp png_ptr, png_voidp io_ptr,
|
| png_rw_ptr read_data_fn)
|
| {
|
| - if(png_ptr == NULL) return;
|
| + if (png_ptr == NULL) return;
|
| png_ptr->io_ptr = io_ptr;
|
|
|
| #if !defined(PNG_NO_STDIO)
|
|
|