Imported from libpng-1.2.4rc1.tar

2025-07-10 18:04:09 +02:00 · 2002-07-01 22:23:46 -05:00
parent d020e9d826
commit 2ae022da7e
63 changed files with 332 additions and 158 deletions
--- a/png.h
+++ b/png.h
@@ -1,6 +1,6 @@
 /* png.h - header file for PNG reference library
 *
- * libpng version 1.2.4beta3 - June 28, 2002
+ * libpng version 1.2.4rc1 - July 2, 2002
 * Copyright (c) 1998-2002 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.)
@@ -8,7 +8,7 @@
 * Authors and maintainers:
 *  libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat
 *  libpng versions 0.89c, June 1996, through 0.96, May 1997: Andreas Dilger
- *  libpng versions 0.97, January 1998, through 1.2.4beta3 - June 28, 2002: Glenn
+ *  libpng versions 0.97, January 1998, through 1.2.4rc1 - July 2, 2002: Glenn
 *  See also "Contributing Authors", below.
 *
 * Note about libpng version numbers:
@@ -89,6 +89,8 @@
 *    1.2.3rc1-6              12    10203  12.so.0.1.2.3rc1-6
 *    1.2.3                   12    10203  12.so.0.1.2.3
 *    1.2.4beta1-3            13    10204  12.so.0.1.2.4beta1-3
+ *    1.0.14rc1               13    10014  10.so.0.1.0.14rc1
+ *    1.2.4rc1                13    10204  12.so.0.1.2.4rc1
 *
 *    Henceforth the source version will match the shared-library major
 *    and minor numbers; the shared-library major version number will be
@@ -118,7 +120,7 @@
 * If you modify libpng you may insert additional notices immediately following
 * this sentence.
 *
- * libpng versions 1.0.7, July 1, 2000, through 1.2.4beta3, June 28, 2002, are
+ * libpng versions 1.0.7, July 1, 2000, through 1.2.4rc1, July 2, 2002, are
 * Copyright (c) 2000-2002 Glenn Randers-Pehrson, and are
 * distributed according to the same disclaimer and license as libpng-1.0.6
 * with the following individuals added to the list of Contributing Authors
@@ -223,13 +225,13 @@
 * Y2K compliance in libpng:
 * =========================
 *
- *    June 28, 2002
+ *    July 2, 2002
 *
 *    Since the PNG Development group is an ad-hoc body, we can't make
 *    an official declaration.
 *
 *    This is your unofficial assurance that libpng from version 0.71 and
- *    upward through 1.2.4beta3 are Y2K compliant.  It is my belief that earlier
+ *    upward through 1.2.4rc1 are Y2K compliant.  It is my belief that earlier
 *    versions were also Y2K compliant.
 *
 *    Libpng only has three year fields.  One is a 2-byte unsigned integer
@@ -285,7 +287,7 @@
 */

 /* Version information for png.h - this should match the version in png.c */
-#define PNG_LIBPNG_VER_STRING "1.2.4beta3"
+#define PNG_LIBPNG_VER_STRING "1.2.4rc1"

 #define PNG_LIBPNG_VER_SONUM   0
 #define PNG_LIBPNG_VER_DLLNUM  %DLLNUM%
@@ -297,7 +299,7 @@
 /* This should match the numeric part of the final component of
 * PNG_LIBPNG_VER_STRING, omitting any leading zero: */

-#define PNG_LIBPNG_VER_BUILD  3
+#define PNG_LIBPNG_VER_BUILD  1

 #define PNG_LIBPNG_BUILD_ALPHA    1
 #define PNG_LIBPNG_BUILD_BETA     2
@@ -305,7 +307,7 @@
 #define PNG_LIBPNG_BUILD_STABLE   4
 #define PNG_LIBPNG_BUILD_TYPEMASK 7
 #define PNG_LIBPNG_BUILD_PATCH    8 /* Can be OR'ed with STABLE only */
-#define PNG_LIBPNG_BUILD_TYPE 2
+#define PNG_LIBPNG_BUILD_TYPE 3

 /* Careful here.  At one time, Guy wanted to use 082, but that would be octal.
 * We must not include leading zeros.
@@ -1259,10 +1261,11 @@ struct png_struct_def
   png_free_ptr free_fn;             /* function for freeing memory */
 #endif

+/* New member added in libpng-1.0.13 and 1.2.0 */
   png_bytep big_row_buf;         /* buffer to save current (unfiltered) row */

 #if defined(PNG_READ_DITHER_SUPPORTED)
-/* The following three members were added at version 1.2.4 */
+/* The following three members were added at version 1.0.14 and 1.2.4 */
   png_bytep dither_sort;            /* working sort array */
   png_bytep index_to_palette;       /* where the original index currently is */
                                     /* in the palette */
@@ -1274,9 +1277,9 @@ struct png_struct_def


 /* This prevents a compiler error in png.c if png.c and png.h are both at
-   version 1.2.4beta3
+   version 1.2.4rc1
 */
-typedef png_structp version_1_2_4beta3;
+typedef png_structp version_1_2_4rc1;

 typedef png_struct FAR * FAR * png_structpp;

@@ -1536,7 +1539,7 @@ extern PNG_EXPORT(void,png_start_read_image) PNGARG((png_structp png_ptr));
 extern PNG_EXPORT(void,png_read_update_info) PNGARG((png_structp png_ptr,
   png_infop info_ptr));

-/* read a one or more rows of image data. */
+/* read one or more rows of image data. */
 extern PNG_EXPORT(void,png_read_rows) PNGARG((png_structp png_ptr,
   png_bytepp row, png_bytepp display_row, png_uint_32 num_rows));

@@ -1826,13 +1829,26 @@ extern PNG_EXPORT(void,png_progressive_combine_row) PNGARG((png_structp png_ptr,
 extern PNG_EXPORT(png_voidp,png_malloc) PNGARG((png_structp png_ptr,
   png_uint_32 size));

+#if defined(PNG_1_0_X)
+#  define png_malloc_warn png_malloc
+#else
 /* Added at libpng version 1.2.4 */
 extern PNG_EXPORT(png_voidp,png_malloc_warn) PNGARG((png_structp png_ptr,
   png_uint_32 size));
+#endif

 /* frees a pointer allocated by png_malloc() */
 extern PNG_EXPORT(void,png_free) PNGARG((png_structp png_ptr, png_voidp ptr));

+#if defined(PNG_1_0_X)
+/* Function to allocate memory for zlib. */
+extern PNG_EXPORT(voidpf,png_zalloc) PNGARG((voidpf png_ptr, uInt items,
+   uInt size));
+
+/* Function to free memory for zlib */
+extern PNG_EXPORT(void,png_zfree) PNGARG((voidpf png_ptr, voidpf ptr));
+#endif
+
 /* Free data that was allocated internally */
 extern PNG_EXPORT(void,png_free_data) PNGARG((png_structp png_ptr,
   png_infop info_ptr, png_uint_32 free_me, int num));
@@ -2403,7 +2419,7 @@ extern PNG_EXPORT(void,png_set_strip_error_numbers) PNGARG((png_structp
 /* Maintainer: Put new public prototypes here ^, in libpng.3, and project defs */

 #define PNG_HEADER_VERSION_STRING \
-   " libpng version 1.2.4beta3 - June 28, 2002 (header)\n"
+   " libpng version 1.2.4rc1 - July 2, 2002 (header)\n"

 #ifdef PNG_READ_COMPOSITE_NODIV_SUPPORTED
 /* With these routines we avoid an integer divide, which will be slower on
@@ -2674,6 +2690,7 @@ PNG_EXTERN void png_destroy_struct_2 PNGARG((png_voidp struct_ptr,
 PNG_EXTERN void png_info_destroy PNGARG((png_structp png_ptr,
   png_infop info_ptr));

+#ifndef PNG_1_0_X
 /* Function to allocate memory for zlib. */
 PNG_EXTERN voidpf png_zalloc PNGARG((voidpf png_ptr, uInt items, uInt size));

@@ -2699,6 +2716,12 @@ PNG_EXTERN void PNGAPI png_default_write_data PNGARG((png_structp png_ptr,
 PNG_EXTERN void PNGAPI png_default_flush PNGARG((png_structp png_ptr));
 #endif
 #endif
+#else /* PNG_1_0_X */
+#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
+PNG_EXTERN void png_push_fill_buffer PNGARG((png_structp png_ptr,
+   png_bytep buffer, png_size_t length));
+#endif
+#endif /* PNG_1_0_X */

 /* Reset the CRC variable */
 PNG_EXTERN void png_reset_crc PNGARG((png_structp png_ptr));
@@ -2863,7 +2886,7 @@ PNG_EXTERN void png_write_iTXt PNGARG((png_structp png_ptr,
   png_charp text));
 #endif

-#if defined(PNG_TEXT_SUPPORTED)  /* Added at version 1.2.4 */
+#if defined(PNG_TEXT_SUPPORTED)  /* Added at version 1.0.14 and 1.2.4 */
 PNG_EXTERN int png_set_text_2 PNGARG((png_structp png_ptr,
   png_infop info_ptr, png_textp text_ptr, int num_text));
 #endif