| OLD | NEW |
| 1 | 1 |
| 2 /* png.c - location for general purpose libpng functions | 2 /* png.c - location for general purpose libpng functions |
| 3 * | 3 * |
| 4 * Last changed in libpng 1.2.43 [February 25, 2010] | 4 * Last changed in libpng 1.2.43 [February 25, 2010] |
| 5 * Copyright (c) 1998-2010 Glenn Randers-Pehrson | 5 * Copyright (c) 1998-2010 Glenn Randers-Pehrson |
| 6 * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) | 6 * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) |
| 7 * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) | 7 * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) |
| 8 * | 8 * |
| 9 * This code is released under the libpng license. | 9 * This code is released under the libpng license. |
| 10 * For conditions of distribution and use, see the disclaimer | 10 * For conditions of distribution and use, see the disclaimer |
| 11 * and license in png.h | 11 * and license in png.h |
| 12 */ | 12 */ |
| 13 | 13 |
| 14 #define PNG_INTERNAL | 14 #define PNG_INTERNAL |
| 15 #define PNG_NO_EXTERN | 15 #define PNG_NO_EXTERN |
| 16 #define PNG_NO_PEDANTIC_WARNINGS | 16 #define PNG_NO_PEDANTIC_WARNINGS |
| 17 #include "png.h" | 17 #include "png.h" |
| 18 | 18 |
| 19 /* Generate a compiler error if there is an old png.h in the search path. */ | 19 /* Generate a compiler error if there is an old png.h in the search path. */ |
| 20 typedef version_1_2_44 Your_png_h_is_not_version_1_2_44; | 20 typedef version_1_2_45 Your_png_h_is_not_version_1_2_45; |
| 21 | 21 |
| 22 /* Version information for C files. This had better match the version | 22 /* Version information for C files. This had better match the version |
| 23 * string defined in png.h. | 23 * string defined in png.h. |
| 24 */ | 24 */ |
| 25 | 25 |
| 26 #ifdef PNG_USE_GLOBAL_ARRAYS | 26 #ifdef PNG_USE_GLOBAL_ARRAYS |
| 27 /* png_libpng_ver was changed to a function in version 1.0.5c */ | 27 /* png_libpng_ver was changed to a function in version 1.0.5c */ |
| 28 PNG_CONST char png_libpng_ver[18] = PNG_LIBPNG_VER_STRING; | 28 PNG_CONST char png_libpng_ver[18] = PNG_LIBPNG_VER_STRING; |
| 29 | 29 |
| 30 #ifdef PNG_READ_SUPPORTED | 30 #ifdef PNG_READ_SUPPORTED |
| (...skipping 686 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 717 | 717 |
| 718 png_charp PNGAPI | 718 png_charp PNGAPI |
| 719 png_get_copyright(png_structp png_ptr) | 719 png_get_copyright(png_structp png_ptr) |
| 720 { | 720 { |
| 721 png_ptr = png_ptr; /* Silence compiler warning about unused png_ptr */ | 721 png_ptr = png_ptr; /* Silence compiler warning about unused png_ptr */ |
| 722 #ifdef PNG_STRING_COPYRIGHT | 722 #ifdef PNG_STRING_COPYRIGHT |
| 723 return PNG_STRING_COPYRIGHT | 723 return PNG_STRING_COPYRIGHT |
| 724 #else | 724 #else |
| 725 #ifdef __STDC__ | 725 #ifdef __STDC__ |
| 726 return ((png_charp) PNG_STRING_NEWLINE \ | 726 return ((png_charp) PNG_STRING_NEWLINE \ |
| 727 "libpng version 1.2.44 - June 26, 2010" PNG_STRING_NEWLINE \ | 727 "libpng version 1.2.45 - July 7, 2011" PNG_STRING_NEWLINE \ |
| 728 "Copyright (c) 1998-2010 Glenn Randers-Pehrson" PNG_STRING_NEWLINE \ | 728 "Copyright (c) 1998-2010 Glenn Randers-Pehrson" PNG_STRING_NEWLINE \ |
| 729 "Copyright (c) 1996-1997 Andreas Dilger" PNG_STRING_NEWLINE \ | 729 "Copyright (c) 1996-1997 Andreas Dilger" PNG_STRING_NEWLINE \ |
| 730 "Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc." \ | 730 "Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc." \ |
| 731 PNG_STRING_NEWLINE); | 731 PNG_STRING_NEWLINE); |
| 732 #else | 732 #else |
| 733 return ((png_charp) "libpng version 1.2.44 - June 26, 2010\ | 733 return ((png_charp) "libpng version 1.2.45 - July 7, 2011\ |
| 734 Copyright (c) 1998-2010 Glenn Randers-Pehrson\ | 734 Copyright (c) 1998-2010 Glenn Randers-Pehrson\ |
| 735 Copyright (c) 1996-1997 Andreas Dilger\ | 735 Copyright (c) 1996-1997 Andreas Dilger\ |
| 736 Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc."); | 736 Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc."); |
| 737 #endif | 737 #endif |
| 738 #endif | 738 #endif |
| 739 } | 739 } |
| 740 | 740 |
| 741 /* The following return the library version as a short string in the | 741 /* The following return the library version as a short string in the |
| 742 * format 1.0.0 through 99.99.99zz. To get the version of *.h files | 742 * format 1.0.0 through 99.99.99zz. To get the version of *.h files |
| 743 * used with your application, print out PNG_LIBPNG_VER_STRING, which | 743 * used with your application, print out PNG_LIBPNG_VER_STRING, which |
| (...skipping 347 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1091 { | 1091 { |
| 1092 png_warning(png_ptr, "Unknown filter method in IHDR"); | 1092 png_warning(png_ptr, "Unknown filter method in IHDR"); |
| 1093 error = 1; | 1093 error = 1; |
| 1094 } | 1094 } |
| 1095 #endif | 1095 #endif |
| 1096 | 1096 |
| 1097 if (error == 1) | 1097 if (error == 1) |
| 1098 png_error(png_ptr, "Invalid IHDR data"); | 1098 png_error(png_ptr, "Invalid IHDR data"); |
| 1099 } | 1099 } |
| 1100 #endif /* defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED) */ | 1100 #endif /* defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED) */ |
| OLD | NEW |