# HG changeset patch
# User Eli Zaretskii <eliz@gnu.org>
# Date 1118507114 0
# Node ID 2fc387823c301841ea05672c7ef88e5f6960067c
# Parent  ccf928f0383cbd0489333df66a34b89b03184846
*** empty log message ***

diff -r ccf928f0383c -r 2fc387823c30 src/ChangeLog
--- a/src/ChangeLog	Sat Jun 11 16:24:36 2005 +0000
+++ b/src/ChangeLog	Sat Jun 11 16:25:14 2005 +0000
@@ -1,5 +1,25 @@
 2005-06-11  Eli Zaretskii  <eliz@gnu.org>
 
+	* image.c (x_create_x_image_and_pixmap) [HAVE_NTGUI]: Cast 4th arg
+	to CreateDIBSection to avoid a compiler warning.
+	(pbm_load): Cast 3rd arg to IMAGE_BACKGROUND to avoid a compiler
+	warning.
+	(png_load): Cast return values of fn_png_create_read_struct and
+	fn_png_create_info_struct, to avoid compiler warnings on W32.
+	Cast 3rd arg to IMAGE_BACKGROUND and image_background_transparent
+	to avoid compiler warnings.
+	(jpeg_load): Cast return value of fn_jpeg_std_error to avoid a
+	compiler warning on W32.  Cast 3rd arg to IMAGE_BACKGROUND to
+	avoid a compiler warning.
+	(tiff_load): Cast return values of fn_TIFFOpen and
+	fn_TIFFClientOpen to avoid compiler warning on W32.  Cast 3rd arg
+	to IMAGE_BACKGROUND to avoid a compiler warning.
+	(gif_load): Cast return values of fn_DGifOpenFileName and
+	fn_DGifOpen to avoid compiler warnings on W32.  Cast 3rd arg to
+	IMAGE_BACKGROUND to avoid a compiler warning.
+	(DrawText) [HAVE_NTGUI || MAC_OS]: If already defined, undef
+	before redefining.
+
 	* w32bdf.c (create_offscreen_bitmap): Cast `bitsp' to `void **' in
 	the call to CreateDIBSection, to avoid a compiler warning.