[devel] Imported from libpng-1.4.0beta96.tarv1.4.0beta96

4 files changed, 6 insertions, 11 deletions

diff --git a/libpng-1.4.0beta96.txt b/libpng-1.4.0beta96.txt
index 206d7838f..7a0e5b355 100644
--- a/libpng-1.4.0beta96.txt
+++ b/libpng-1.4.0beta96.txt
@@ -3069,7 +3069,8 @@ png_set_mmx_thresholds(), png_get_asm_flags(),
 png_get_mmx_bitdepth_threshold(), png_get_mmx_rowbytes_threshold(),
 png_set_asm_flags(), and png_mmx_supported()
 
-We removed the png_memcpy_check() and png_memset_check() functions.
+We removed the png_check_sig(), png_memcpy_check(), and
+png_memset_check() functions.
 
 We changed the prototype for png_malloc() from
     png_malloc(png_structp png_ptr, png_uint_32 size)
diff --git a/libpng.3 b/libpng.3
index 54acca469..818830a8b 100644
--- a/libpng.3
+++ b/libpng.3
@@ -20,10 +20,6 @@ libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0beta96
 
 \fI\fB
 
-\fBint png_check_sig (png_bytep \fP\fIsig\fP\fB, int \fInum\fP\fB);\fP
-
-\fI\fB
-
 \fBvoid png_chunk_error (png_structp \fP\fIpng_ptr\fP\fB, png_const_charp \fIerror\fP\fB);\fP
 
 \fI\fB
@@ -3858,7 +3854,8 @@ png_set_mmx_thresholds(), png_get_asm_flags(),
 png_get_mmx_bitdepth_threshold(), png_get_mmx_rowbytes_threshold(),
 png_set_asm_flags(), and png_mmx_supported()
 
-We removed the png_memcpy_check() and png_memset_check() functions.
+We removed the png_check_sig(), png_memcpy_check(), and
+png_memset_check() functions.
 
 We changed the prototype for png_malloc() from
     png_malloc(png_structp png_ptr, png_uint_32 size)
diff --git a/png.h b/png.h
index 3543e1546..f66e3bb36 100644
--- a/png.h
+++ b/png.h
@@ -1360,11 +1360,6 @@ extern PNG_EXPORT(void,png_set_sig_bytes) PNGARG((png_structp png_ptr,
 extern PNG_EXPORT(int,png_sig_cmp) PNGARG((png_bytep sig, png_size_t start,
    png_size_t num_to_check));
 
-/* Simple signature checking function.  This is the same as calling
- * png_check_sig(sig, n) := !png_sig_cmp(sig, 0, n).
- */
-#define png_check_sig(sig,n) !png_sig_cmp((sig), 0, (n))
-
 /* Allocate and initialize png_ptr struct for reading, and any other memory. */
 extern PNG_EXPORT(png_structp,png_create_read_struct)
    PNGARG((png_const_charp user_png_ver, png_voidp error_ptr,
diff --git a/pngconf.h b/pngconf.h
index a47f559d0..5c1e28a8f 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -1289,6 +1289,8 @@ typedef char            FAR * FAR * FAR * png_charppp;
 /* Support for compiler specific function attributes.  These are used
  * so that where compiler support is available incorrect use of API
  * functions in png.h will generate compiler warnings.
+ *
+ * Added at libpng-1.2.41.
  */
 #ifdef __GNUC__
 #  ifndef PNG_DEPRECATED