| OLD | NEW |
| 1 /* png.h - header file for PNG reference library | 1 /* png.h - header file for PNG reference library |
| 2 * | 2 * |
| 3 * libpng version 1.2.36 - May 7, 2009 | 3 * libpng version 1.2.37 - June 4, 2009 |
| 4 * Copyright (c) 1998-2009 Glenn Randers-Pehrson | 4 * Copyright (c) 1998-2009 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 * Authors and maintainers: | 8 * Authors and maintainers: |
| 9 * libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat | 9 * libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat |
| 10 * libpng versions 0.89c, June 1996, through 0.96, May 1997: Andreas Dilger | 10 * libpng versions 0.89c, June 1996, through 0.96, May 1997: Andreas Dilger |
| 11 * libpng versions 0.97, January 1998, through 1.2.36 - May 7, 2009: Glenn | 11 * libpng versions 0.97, January 1998, through 1.2.37 - June 4, 2009: Glenn |
| 12 * See also "Contributing Authors", below. | 12 * See also "Contributing Authors", below. |
| 13 * | 13 * |
| 14 * Note about libpng version numbers: | 14 * Note about libpng version numbers: |
| 15 * | 15 * |
| 16 * Due to various miscommunications, unforeseen code incompatibilities | 16 * Due to various miscommunications, unforeseen code incompatibilities |
| 17 * and occasional factors outside the authors' control, version numbering | 17 * and occasional factors outside the authors' control, version numbering |
| 18 * on the library has not always been consistent and straightforward. | 18 * on the library has not always been consistent and straightforward. |
| 19 * The following table summarizes matters since version 0.89c, which was | 19 * The following table summarizes matters since version 0.89c, which was |
| 20 * the first widely used release: | 20 * the first widely used release: |
| 21 * | 21 * |
| (...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 219 * 1.2.34 13 10234 12.so.0.34[.0] | 219 * 1.2.34 13 10234 12.so.0.34[.0] |
| 220 * 1.2.35beta01-03 13 10235 12.so.0.35[.0] | 220 * 1.2.35beta01-03 13 10235 12.so.0.35[.0] |
| 221 * 1.0.43rc01-02 10 10043 10.so.0.43[.0] | 221 * 1.0.43rc01-02 10 10043 10.so.0.43[.0] |
| 222 * 1.2.35rc01-02 13 10235 12.so.0.35[.0] | 222 * 1.2.35rc01-02 13 10235 12.so.0.35[.0] |
| 223 * 1.0.43 10 10043 10.so.0.43[.0] | 223 * 1.0.43 10 10043 10.so.0.43[.0] |
| 224 * 1.2.35 13 10235 12.so.0.35[.0] | 224 * 1.2.35 13 10235 12.so.0.35[.0] |
| 225 * 1.2.36beta01-05 13 10236 12.so.0.36[.0] | 225 * 1.2.36beta01-05 13 10236 12.so.0.36[.0] |
| 226 * 1.2.36rc01 13 10236 12.so.0.36[.0] | 226 * 1.2.36rc01 13 10236 12.so.0.36[.0] |
| 227 * 1.0.44 10 10044 10.so.0.44[.0] | 227 * 1.0.44 10 10044 10.so.0.44[.0] |
| 228 * 1.2.36 13 10236 12.so.0.36[.0] | 228 * 1.2.36 13 10236 12.so.0.36[.0] |
| 229 * 1.2.37beta01-03 13 10237 12.so.0.37[.0] |
| 230 * 1.2.37rc01 13 10237 12.so.0.37[.0] |
| 231 * 1.2.37 13 10237 12.so.0.37[.0] |
| 229 * | 232 * |
| 230 * Henceforth the source version will match the shared-library major | 233 * Henceforth the source version will match the shared-library major |
| 231 * and minor numbers; the shared-library major version number will be | 234 * and minor numbers; the shared-library major version number will be |
| 232 * used for changes in backward compatibility, as it is intended. The | 235 * used for changes in backward compatibility, as it is intended. The |
| 233 * PNG_LIBPNG_VER macro, which is not used within libpng but is available | 236 * PNG_LIBPNG_VER macro, which is not used within libpng but is available |
| 234 * for applications, is an unsigned integer of the form xyyzz corresponding | 237 * for applications, is an unsigned integer of the form xyyzz corresponding |
| 235 * to the source version x.y.z (leading zeros in y and z). Beta versions | 238 * to the source version x.y.z (leading zeros in y and z). Beta versions |
| 236 * were given the previous public release number plus a letter, until | 239 * were given the previous public release number plus a letter, until |
| 237 * version 1.0.6j; from then on they were given the upcoming public | 240 * version 1.0.6j; from then on they were given the upcoming public |
| 238 * release number plus "betaNN" or "rcNN". | 241 * release number plus "betaNN" or "rcNN". |
| 239 * | 242 * |
| 240 * Binary incompatibility exists only when applications make direct access | 243 * Binary incompatibility exists only when applications make direct access |
| 241 * to the info_ptr or png_ptr members through png.h, and the compiled | 244 * to the info_ptr or png_ptr members through png.h, and the compiled |
| 242 * application is loaded with a different version of the library. | 245 * application is loaded with a different version of the library. |
| 243 * | 246 * |
| 244 * DLLNUM will change each time there are forward or backward changes | 247 * DLLNUM will change each time there are forward or backward changes |
| 245 * in binary compatibility (e.g., when a new feature is added). | 248 * in binary compatibility (e.g., when a new feature is added). |
| 246 * | 249 * |
| 247 * See libpng.txt or libpng.3 for more information. The PNG specification | 250 * See libpng.txt or libpng.3 for more information. The PNG specification |
| 248 * is available as a W3C Recommendation and as an ISO Specification, | 251 * is available as a W3C Recommendation and as an ISO Specification, |
| 249 * <http://www.w3.org/TR/2003/REC-PNG-20031110/ | 252 * <http://www.w3.org/TR/2003/REC-PNG-20031110/ |
| 250 */ | 253 */ |
| 251 | 254 |
| 252 /* | 255 /* |
| 253 * COPYRIGHT NOTICE, DISCLAIMER, and LICENSE: | 256 * COPYRIGHT NOTICE, DISCLAIMER, and LICENSE: |
| 254 * | 257 * |
| 255 * If you modify libpng you may insert additional notices immediately following | 258 * If you modify libpng you may insert additional notices immediately following |
| 256 * this sentence. | 259 * this sentence. |
| 257 * | 260 * |
| 258 * libpng versions 1.2.6, August 15, 2004, through 1.2.36, May 7, 2009, are | 261 * libpng versions 1.2.6, August 15, 2004, through 1.2.37, June 4, 2009, are |
| 259 * Copyright (c) 2004, 2006-2009 Glenn Randers-Pehrson, and are | 262 * Copyright (c) 2004, 2006-2009 Glenn Randers-Pehrson, and are |
| 260 * distributed according to the same disclaimer and license as libpng-1.2.5 | 263 * distributed according to the same disclaimer and license as libpng-1.2.5 |
| 261 * with the following individual added to the list of Contributing Authors: | 264 * with the following individual added to the list of Contributing Authors: |
| 262 * | 265 * |
| 263 * Cosmin Truta | 266 * Cosmin Truta |
| 264 * | 267 * |
| 265 * libpng versions 1.0.7, July 1, 2000, through 1.2.5, October 3, 2002, are | 268 * libpng versions 1.0.7, July 1, 2000, through 1.2.5, October 3, 2002, are |
| 266 * Copyright (c) 2000-2002 Glenn Randers-Pehrson, and are | 269 * Copyright (c) 2000-2002 Glenn Randers-Pehrson, and are |
| 267 * distributed according to the same disclaimer and license as libpng-1.0.6 | 270 * distributed according to the same disclaimer and license as libpng-1.0.6 |
| 268 * with the following individuals added to the list of Contributing Authors: | 271 * with the following individuals added to the list of Contributing Authors: |
| (...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 360 * with testing, bug fixes, and patience. This wouldn't have been | 363 * with testing, bug fixes, and patience. This wouldn't have been |
| 361 * possible without all of you. | 364 * possible without all of you. |
| 362 * | 365 * |
| 363 * Thanks to Frank J. T. Wojcik for helping with the documentation. | 366 * Thanks to Frank J. T. Wojcik for helping with the documentation. |
| 364 */ | 367 */ |
| 365 | 368 |
| 366 /* | 369 /* |
| 367 * Y2K compliance in libpng: | 370 * Y2K compliance in libpng: |
| 368 * ========================= | 371 * ========================= |
| 369 * | 372 * |
| 370 * May 7, 2009 | 373 * June 4, 2009 |
| 371 * | 374 * |
| 372 * Since the PNG Development group is an ad-hoc body, we can't make | 375 * Since the PNG Development group is an ad-hoc body, we can't make |
| 373 * an official declaration. | 376 * an official declaration. |
| 374 * | 377 * |
| 375 * This is your unofficial assurance that libpng from version 0.71 and | 378 * This is your unofficial assurance that libpng from version 0.71 and |
| 376 * upward through 1.2.36 are Y2K compliant. It is my belief that earlier | 379 * upward through 1.2.37 are Y2K compliant. It is my belief that earlier |
| 377 * versions were also Y2K compliant. | 380 * versions were also Y2K compliant. |
| 378 * | 381 * |
| 379 * Libpng only has three year fields. One is a 2-byte unsigned integer | 382 * Libpng only has three year fields. One is a 2-byte unsigned integer |
| 380 * that will hold years up to 65535. The other two hold the date in text | 383 * that will hold years up to 65535. The other two hold the date in text |
| 381 * format, and will hold years up to 9999. | 384 * format, and will hold years up to 9999. |
| 382 * | 385 * |
| 383 * The integer is | 386 * The integer is |
| 384 * "png_uint_16 year" in png_time_struct. | 387 * "png_uint_16 year" in png_time_struct. |
| 385 * | 388 * |
| 386 * The strings are | 389 * The strings are |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 422 #ifndef PNG_H | 425 #ifndef PNG_H |
| 423 #define PNG_H | 426 #define PNG_H |
| 424 | 427 |
| 425 /* This is not the place to learn how to use libpng. The file libpng.txt | 428 /* This is not the place to learn how to use libpng. The file libpng.txt |
| 426 * describes how to use libpng, and the file example.c summarizes it | 429 * describes how to use libpng, and the file example.c summarizes it |
| 427 * with some code on which to build. This file is useful for looking | 430 * with some code on which to build. This file is useful for looking |
| 428 * at the actual function definitions and structure components. | 431 * at the actual function definitions and structure components. |
| 429 */ | 432 */ |
| 430 | 433 |
| 431 /* Version information for png.h - this should match the version in png.c */ | 434 /* Version information for png.h - this should match the version in png.c */ |
| 432 #define PNG_LIBPNG_VER_STRING "1.2.36" | 435 #define PNG_LIBPNG_VER_STRING "1.2.37" |
| 433 #define PNG_HEADER_VERSION_STRING \ | 436 #define PNG_HEADER_VERSION_STRING \ |
| 434 " libpng version 1.2.36 - May 7, 2009\n" | 437 " libpng version 1.2.37 - June 4, 2009\n" |
| 435 | 438 |
| 436 #define PNG_LIBPNG_VER_SONUM 0 | 439 #define PNG_LIBPNG_VER_SONUM 0 |
| 437 #define PNG_LIBPNG_VER_DLLNUM 13 | 440 #define PNG_LIBPNG_VER_DLLNUM 13 |
| 438 | 441 |
| 439 /* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */ | 442 /* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */ |
| 440 #define PNG_LIBPNG_VER_MAJOR 1 | 443 #define PNG_LIBPNG_VER_MAJOR 1 |
| 441 #define PNG_LIBPNG_VER_MINOR 2 | 444 #define PNG_LIBPNG_VER_MINOR 2 |
| 442 #define PNG_LIBPNG_VER_RELEASE 36 | 445 #define PNG_LIBPNG_VER_RELEASE 37 |
| 443 /* This should match the numeric part of the final component of | 446 /* This should match the numeric part of the final component of |
| 444 * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ | 447 * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ |
| 445 | 448 |
| 446 #define PNG_LIBPNG_VER_BUILD 0 | 449 #define PNG_LIBPNG_VER_BUILD 0 |
| 447 | 450 |
| 448 /* Release Status */ | 451 /* Release Status */ |
| 449 #define PNG_LIBPNG_BUILD_ALPHA 1 | 452 #define PNG_LIBPNG_BUILD_ALPHA 1 |
| 450 #define PNG_LIBPNG_BUILD_BETA 2 | 453 #define PNG_LIBPNG_BUILD_BETA 2 |
| 451 #define PNG_LIBPNG_BUILD_RC 3 | 454 #define PNG_LIBPNG_BUILD_RC 3 |
| 452 #define PNG_LIBPNG_BUILD_STABLE 4 | 455 #define PNG_LIBPNG_BUILD_STABLE 4 |
| 453 #define PNG_LIBPNG_BUILD_RELEASE_STATUS_MASK 7 | 456 #define PNG_LIBPNG_BUILD_RELEASE_STATUS_MASK 7 |
| 454 | 457 |
| 455 /* Release-Specific Flags */ | 458 /* Release-Specific Flags */ |
| 456 #define PNG_LIBPNG_BUILD_PATCH 8 /* Can be OR'ed with | 459 #define PNG_LIBPNG_BUILD_PATCH 8 /* Can be OR'ed with |
| 457 PNG_LIBPNG_BUILD_STABLE only */ | 460 PNG_LIBPNG_BUILD_STABLE only */ |
| 458 #define PNG_LIBPNG_BUILD_PRIVATE 16 /* Cannot be OR'ed with | 461 #define PNG_LIBPNG_BUILD_PRIVATE 16 /* Cannot be OR'ed with |
| 459 PNG_LIBPNG_BUILD_SPECIAL */ | 462 PNG_LIBPNG_BUILD_SPECIAL */ |
| 460 #define PNG_LIBPNG_BUILD_SPECIAL 32 /* Cannot be OR'ed with | 463 #define PNG_LIBPNG_BUILD_SPECIAL 32 /* Cannot be OR'ed with |
| 461 PNG_LIBPNG_BUILD_PRIVATE */ | 464 PNG_LIBPNG_BUILD_PRIVATE */ |
| 462 | 465 |
| 463 #define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_STABLE | 466 #define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_STABLE |
| 464 | 467 |
| 465 /* Careful here. At one time, Guy wanted to use 082, but that would be octal. | 468 /* Careful here. At one time, Guy wanted to use 082, but that would be octal. |
| 466 * We must not include leading zeros. | 469 * We must not include leading zeros. |
| 467 * Versions 0.7 through 1.0.0 were in the range 0 to 100 here (only | 470 * Versions 0.7 through 1.0.0 were in the range 0 to 100 here (only |
| 468 * version 1.0.0 was mis-numbered 100 instead of 10000). From | 471 * version 1.0.0 was mis-numbered 100 instead of 10000). From |
| 469 * version 1.0.1 it's xxyyzz, where x=major, y=minor, z=release */ | 472 * version 1.0.1 it's xxyyzz, where x=major, y=minor, z=release */ |
| 470 #define PNG_LIBPNG_VER 10236 /* 1.2.36 */ | 473 #define PNG_LIBPNG_VER 10237 /* 1.2.37 */ |
| 471 | 474 |
| 472 #ifndef PNG_VERSION_INFO_ONLY | 475 #ifndef PNG_VERSION_INFO_ONLY |
| 473 /* include the compression library's header */ | 476 /* include the compression library's header */ |
| 474 #include "zlib.h" | 477 #include "zlib.h" |
| 475 #endif | 478 #endif |
| 476 | 479 |
| 477 /* include all user configurable info, including optional assembler routines */ | 480 /* include all user configurable info, including optional assembler routines */ |
| 478 #include "pngconf.h" | 481 #include "pngconf.h" |
| 479 | 482 |
| 480 /* | 483 /* |
| (...skipping 1003 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1484 | 1487 |
| 1485 /* New member added in libpng-1.2.30 */ | 1488 /* New member added in libpng-1.2.30 */ |
| 1486 png_charp chunkdata; /* buffer for reading chunk data */ | 1489 png_charp chunkdata; /* buffer for reading chunk data */ |
| 1487 | 1490 |
| 1488 }; | 1491 }; |
| 1489 | 1492 |
| 1490 | 1493 |
| 1491 /* This triggers a compiler error in png.c, if png.c and png.h | 1494 /* This triggers a compiler error in png.c, if png.c and png.h |
| 1492 * do not agree upon the version number. | 1495 * do not agree upon the version number. |
| 1493 */ | 1496 */ |
| 1494 typedef png_structp version_1_2_36; | 1497 typedef png_structp version_1_2_37; |
| 1495 | 1498 |
| 1496 typedef png_struct FAR * FAR * png_structpp; | 1499 typedef png_struct FAR * FAR * png_structpp; |
| 1497 | 1500 |
| 1498 /* Here are the function definitions most commonly used. This is not | 1501 /* Here are the function definitions most commonly used. This is not |
| 1499 * the place to find out how to use libpng. See libpng.txt for the | 1502 * the place to find out how to use libpng. See libpng.txt for the |
| 1500 * full explanation, see example.c for the summary. This just provides | 1503 * full explanation, see example.c for the summary. This just provides |
| 1501 * a simple one line description of the use of each function. | 1504 * a simple one line description of the use of each function. |
| 1502 */ | 1505 */ |
| 1503 | 1506 |
| 1504 /* Returns the version number of the library */ | 1507 /* Returns the version number of the library */ |
| (...skipping 2168 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3673 | 3676 |
| 3674 #endif /* PNG_INTERNAL */ | 3677 #endif /* PNG_INTERNAL */ |
| 3675 | 3678 |
| 3676 #ifdef __cplusplus | 3679 #ifdef __cplusplus |
| 3677 } | 3680 } |
| 3678 #endif | 3681 #endif |
| 3679 | 3682 |
| 3680 #endif /* PNG_VERSION_INFO_ONLY */ | 3683 #endif /* PNG_VERSION_INFO_ONLY */ |
| 3681 /* do not put anything past this line */ | 3684 /* do not put anything past this line */ |
| 3682 #endif /* PNG_H */ | 3685 #endif /* PNG_H */ |
| OLD | NEW |