Imported from libpng-1.2.1beta3.tar
diff --git a/pngwrite.c b/pngwrite.c
index 1ca7a37..9301fd8 100644
--- a/pngwrite.c
+++ b/pngwrite.c
@@ -1,7 +1,7 @@
/* pngwrite.c - general routines to write a PNG file
*
- * libpng 1.2.1beta2 - October 25, 2001
+ * libpng 1.2.1beta3 - October 27, 2001
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2001 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@@ -424,7 +424,7 @@
{
#ifdef PNG_USER_MEM_SUPPORTED
return (png_create_write_struct_2(user_png_ver, error_ptr, error_fn,
- warn_fn, (png_voidp)NULL, (png_malloc_ptr)NULL, (png_free_ptr)NULL));
+ warn_fn, png_voidp_NULL, png_malloc_ptr_NULL, png_free_ptr_NULL));
}
/* Alternate initialize png_ptr structure, and allocate any memory needed */
@@ -448,9 +448,7 @@
#else
if ((png_ptr = (png_structp)png_create_struct(PNG_STRUCT_PNG)) == NULL)
#endif /* PNG_USER_MEM_SUPPORTED */
- {
- return ((png_structp)NULL);
- }
+ return (NULL);
#ifdef PNG_ASSEMBLER_CODE_SUPPORTED
png_init_mmx_flags(png_ptr); /* 1.2.0 addition */
@@ -466,7 +464,7 @@
png_free(png_ptr, png_ptr->zbuf);
png_ptr->zbuf=NULL;
png_destroy_struct(png_ptr);
- return ((png_structp)NULL);
+ return (NULL);
}
#ifdef USE_FAR_KEYWORD
png_memcpy(png_ptr->jmpbuf,jmpbuf,sizeof(jmp_buf));
@@ -521,12 +519,12 @@
png_ptr->zbuf = (png_bytep)png_malloc(png_ptr,
(png_uint_32)png_ptr->zbuf_size);
- png_set_write_fn(png_ptr, (png_voidp)NULL, (png_rw_ptr)NULL,
- (png_flush_ptr)NULL);
+ png_set_write_fn(png_ptr, png_voidp_NULL, png_rw_ptr_NULL,
+ png_flush_ptr_NULL);
#if defined(PNG_WRITE_WEIGHTED_FILTER_SUPPORTED)
png_set_filter_heuristics(png_ptr, PNG_FILTER_HEURISTIC_DEFAULT,
- 1, (png_doublep)NULL, (png_doublep)NULL);
+ 1, png_doublep_NULL, png_doublep_NULL);
#endif
return ((png_structp)png_ptr);
@@ -551,7 +549,7 @@
if(sizeof(png_struct) > png_struct_size || sizeof(png_info) > png_info_size)
{
char msg[80];
- png_ptr->warning_fn=(png_error_ptr)NULL;
+ png_ptr->warning_fn=NULL;
if (user_png_ver)
{
sprintf(msg, "Application was compiled with png.h from libpng-%.20s",
@@ -565,7 +563,7 @@
#endif
if(sizeof(png_struct) > png_struct_size)
{
- png_ptr->error_fn=(png_error_ptr)NULL;
+ png_ptr->error_fn=NULL;
#ifdef PNG_ERROR_NUMBERS_SUPPORTED
png_ptr->flags=0;
#endif
@@ -574,7 +572,7 @@
}
if(sizeof(png_info) > png_info_size)
{
- png_ptr->error_fn=(png_error_ptr)NULL;
+ png_ptr->error_fn=NULL;
#ifdef PNG_ERROR_NUMBERS_SUPPORTED
png_ptr->flags=0;
#endif
@@ -601,7 +599,7 @@
#ifdef PNG_LEGACY_SUPPORTED
png_ptr->flags |= PNG_FLAG_LIBRARY_MISMATCH;
#else
- png_ptr->warning_fn=(png_error_ptr)NULL;
+ png_ptr->warning_fn=NULL;
png_warning(png_ptr,
"Application uses deprecated png_write_init() and should be recompiled.");
break;
@@ -635,8 +633,8 @@
png_memcpy(png_ptr->jmpbuf, tmp_jmp, sizeof (jmp_buf));
#endif
- png_set_write_fn(png_ptr, (png_voidp)NULL, (png_rw_ptr)NULL,
- (png_flush_ptr)NULL);
+ png_set_write_fn(png_ptr, png_voidp_NULL, png_rw_ptr_NULL,
+ png_flush_ptr_NULL);
/* initialize zbuf - compression buffer */
png_ptr->zbuf_size = PNG_ZBUF_SIZE;
@@ -645,7 +643,7 @@
#if defined(PNG_WRITE_WEIGHTED_FILTER_SUPPORTED)
png_set_filter_heuristics(png_ptr, PNG_FILTER_HEURISTIC_DEFAULT,
- 1, (png_doublep)NULL, (png_doublep)NULL);
+ 1, png_doublep_NULL, png_doublep_NULL);
#endif
}
@@ -970,7 +968,7 @@
#else
png_destroy_struct((png_voidp)info_ptr);
#endif
- *info_ptr_ptr = (png_infop)NULL;
+ *info_ptr_ptr = NULL;
}
if (png_ptr != NULL)
@@ -982,7 +980,7 @@
#else
png_destroy_struct((png_voidp)png_ptr);
#endif
- *png_ptr_ptr = (png_structp)NULL;
+ *png_ptr_ptr = NULL;
}
}