| OLD | NEW |
| 1 | 1 |
| 2 /* pngstruct.h - header file for PNG reference library | 2 /* pngstruct.h - header file for PNG reference library |
| 3 * | 3 * |
| 4 * Copyright (c) 1998-2013 Glenn Randers-Pehrson | 4 * Copyright (c) 1998-2013 Glenn Randers-Pehrson |
| 5 * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) | 5 * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) |
| 6 * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) | 6 * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) |
| 7 * | 7 * |
| 8 * Last changed in libpng 1.6.1 [March 28, 2013] | 8 * Last changed in libpng 1.6.1 [March 28, 2013] |
| 9 * | 9 * |
| 10 * This code is released under the libpng license. | 10 * This code is released under the libpng license. |
| (...skipping 10 matching lines...) Expand all Loading... |
| 21 #ifndef PNGSTRUCT_H | 21 #ifndef PNGSTRUCT_H |
| 22 #define PNGSTRUCT_H | 22 #define PNGSTRUCT_H |
| 23 /* zlib.h defines the structure z_stream, an instance of which is included | 23 /* zlib.h defines the structure z_stream, an instance of which is included |
| 24 * in this structure and is required for decompressing the LZ compressed | 24 * in this structure and is required for decompressing the LZ compressed |
| 25 * data in PNG files. | 25 * data in PNG files. |
| 26 */ | 26 */ |
| 27 #ifndef ZLIB_CONST | 27 #ifndef ZLIB_CONST |
| 28 /* We must ensure that zlib uses 'const' in declarations. */ | 28 /* We must ensure that zlib uses 'const' in declarations. */ |
| 29 # define ZLIB_CONST | 29 # define ZLIB_CONST |
| 30 #endif | 30 #endif |
| 31 #include "../zlib_v128/zlib.h" | 31 #include "third_party/zlib_v128/zlib.h" |
| 32 #ifdef const | 32 #ifdef const |
| 33 /* zlib.h sometimes #defines const to nothing, undo this. */ | 33 /* zlib.h sometimes #defines const to nothing, undo this. */ |
| 34 # undef const | 34 # undef const |
| 35 #endif | 35 #endif |
| 36 | 36 |
| 37 /* zlib.h has mediocre z_const use before 1.2.6, this stuff is for compatibility | 37 /* zlib.h has mediocre z_const use before 1.2.6, this stuff is for compatibility |
| 38 * with older builds. | 38 * with older builds. |
| 39 */ | 39 */ |
| 40 #if ZLIB_VERNUM < 0x1260 | 40 #if ZLIB_VERNUM < 0x1260 |
| 41 # define PNGZ_MSG_CAST(s) png_constcast(char*,s) | 41 # define PNGZ_MSG_CAST(s) png_constcast(char*,s) |
| (...skipping 438 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 480 void (*read_filter[PNG_FILTER_VALUE_LAST-1])(png_row_infop row_info, | 480 void (*read_filter[PNG_FILTER_VALUE_LAST-1])(png_row_infop row_info, |
| 481 png_bytep row, png_const_bytep prev_row); | 481 png_bytep row, png_const_bytep prev_row); |
| 482 | 482 |
| 483 #ifdef PNG_READ_SUPPORTED | 483 #ifdef PNG_READ_SUPPORTED |
| 484 #if defined(PNG_COLORSPACE_SUPPORTED) || defined(PNG_GAMMA_SUPPORTED) | 484 #if defined(PNG_COLORSPACE_SUPPORTED) || defined(PNG_GAMMA_SUPPORTED) |
| 485 png_colorspace colorspace; | 485 png_colorspace colorspace; |
| 486 #endif | 486 #endif |
| 487 #endif | 487 #endif |
| 488 }; | 488 }; |
| 489 #endif /* PNGSTRUCT_H */ | 489 #endif /* PNGSTRUCT_H */ |
| OLD | NEW |