Imported from libpng-1.0.9beta8.tar
diff --git a/png.h b/png.h
index 7f77ac6..82a98e3 100644
--- a/png.h
+++ b/png.h
@@ -1,15 +1,15 @@
/* png.h - header file for PNG reference library
*
- * libpng version 1.0.9beta7 - December 28, 2000
- * Copyright (c) 1998, 1999, 2000 Glenn Randers-Pehrson
+ * libpng version 1.0.9beta8 - January 12, 2001
+ * Copyright (c) 1998, 1999, 2000, 2001 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.)
*
* 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.0.9beta7 - December 28, 2000: Glenn
+ * libpng versions 0.97, January 1998, through 1.0.9beta8 - January 12, 2001: Glenn
* See also "Contributing Authors", below.
*
* Note about libpng version numbers:
@@ -60,7 +60,7 @@
* 1.0.8 10008 2.1.0.8
* 1.0.9beta1-6 10009 2.1.0.9beta1-6
* 1.0.9rc1 10009 2.1.0.9rc1
- * 1.0.9beta7 10009 2.1.0.9beta7
+ * 1.0.9beta7-8 10009 2.1.0.9beta7-8
*
* Henceforth the source version will match the shared-library major
* and minor numbers; the shared-library major version number will be
@@ -87,8 +87,8 @@
* If you modify libpng you may insert additional notices immediately following
* this sentence.
*
- * libpng versions 1.0.7, July 1, 2000, through 1.0.9beta7, December 28, 2000, are
- * Copyright (c) 2000 Glenn Randers-Pehrson, and are
+ * libpng versions 1.0.7, July 1, 2000, through 1.0.9beta8, January 12, 2001, are
+ * Copyright (c) 2000, 2001 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
*
@@ -192,13 +192,13 @@
* Y2K compliance in libpng:
* =========================
*
- * December 28, 2000
+ * January 12, 2001
*
* 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.0.9beta7 are Y2K compliant. It is my belief that earlier
+ * upward through 1.0.9beta8 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
@@ -254,7 +254,7 @@
*/
/* Version information for png.h - this should match the version in png.c */
-#define PNG_LIBPNG_VER_STRING "1.0.9beta7"
+#define PNG_LIBPNG_VER_STRING "1.0.9beta8"
#define PNG_LIBPNG_VER_SONUM 2
@@ -265,7 +265,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 7
+#define PNG_LIBPNG_VER_BUILD 8
#define PNG_LIBPNG_BUILD_ALPHA 1
#define PNG_LIBPNG_BUILD_BETA 2
@@ -287,14 +287,9 @@
/* include the compression library's header */
#include "zlib.h"
-/* include all user configurable info */
+/* include all user configurable info, including optional assembler routines */
#include "pngconf.h"
-/* macros for optional assembler routines */
-#if defined(PNG_INTERNAL) && defined(PNG_ASSEMBLER_CODE_SUPPORTED)
-# include "pngasmrd.h"
-#endif
-
/* Inhibit C++ name-mangling for libpng functions but not for system calls. */
#ifdef __cplusplus
extern "C" {
@@ -448,7 +443,7 @@
* Two conversions are provided, both from time_t and struct tm. There
* is no portable way to convert to either of these structures, as far
* as I know. If you know of a portable way, send it to me. As a side
- * note - PNG is Year 2000 compliant!
+ * note - PNG has always been Year 2000 compliant!
*/
typedef struct png_time_struct
{
@@ -1175,10 +1170,11 @@
};
+
/* This prevents a compiler error in png_get_copyright() in png.c if png.c
-and png.h are both at * version 1.0.9beta7
+and png.h are both at * version 1.0.9beta8
*/
-typedef png_structp version_1_0_9beta7;
+typedef png_structp version_1_0_9beta8;
typedef png_struct FAR * FAR * png_structpp;
@@ -2218,8 +2214,13 @@
png_ptr, png_uint_32 mng_features_permitted));
#endif
+/* png.c, pnggccrd.c, or pngvcrd.c */
+extern PNG_EXPORT(int,png_mmx_support) PNGARG((void));
+
+/* Maintainer: Put new public prototypes here ^ and in libpng.3 */
+
#define PNG_HEADER_VERSION_STRING \
- " libpng version 1.0.9beta7 - December 28, 2000 (header)\n"
+ " libpng version 1.0.9beta8 - January 12, 2001 (header)\n"
#ifdef PNG_READ_COMPOSITE_NODIV_SUPPORTED
/* With these routines we avoid an integer divide, which will be slower on
@@ -2699,10 +2700,15 @@
#if defined(PNG_READ_INTERLACING_SUPPORTED)
/* expand an interlaced row */
+/* OLD interface:
PNG_EXTERN void png_do_read_interlace PNGARG((png_row_infop row_info,
png_bytep row, int pass, png_uint_32 transformations));
+ */
+PNG_EXTERN void png_do_read_interlace PNGARG((png_structp png_ptr));
#endif
+/* GRR TO DO (2.0 or whenever): simplify other internal calling interfaces */
+
#if defined(PNG_WRITE_INTERLACING_SUPPORTED)
/* grab pixels out of a row for an interlaced pass */
PNG_EXTERN void png_do_write_interlace PNGARG((png_row_infop row_info,
@@ -3014,6 +3020,8 @@
png_bytep row));
#endif
+/* Maintainer: Put new private prototypes here ^ and in libpngpf.3 */
+
#endif /* PNG_INTERNAL */
#ifdef __cplusplus
