simplify/cleanup wxTheXXXList and wxGDIObject code (patch 1452023 from Paul Cornett)

[wxWidgets.git] / src / png / pngrutil.c

diff --git a/src/png/pngrutil.c b/src/png/pngrutil.c
index 99455514ea2d92e7012351f53c6bdc3a3a067732..b61664aa6c1290eb7507a43f251189e1cf6f131b 100644 (file)
--- a/src/png/pngrutil.c
+++ b/src/png/pngrutil.c
@@ -1,6 +1,6 @@
 /* pngrutil.c - utilities to read a PNG file
  *
 /* pngrutil.c - utilities to read a PNG file
  *

- * libpng version 1.2.6 - August 15, 2004
+ * libpng version 1.2.7 - September 12, 2004

  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1998-2004 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1998-2004 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)


@@ -279,13 +279,13 @@ png_decompress_chunk(png_structp png_ptr, int comp_type,
 
          if (ret == Z_BUF_ERROR)
             sprintf(umsg,"Buffer error in compressed datastream in %s chunk",
 
          if (ret == Z_BUF_ERROR)
             sprintf(umsg,"Buffer error in compressed datastream in %s chunk",

-                png_ptr->chunk_name);
+                (char *)png_ptr->chunk_name);

          else if (ret == Z_DATA_ERROR)
             sprintf(umsg,"Data error in compressed datastream in %s chunk",
          else if (ret == Z_DATA_ERROR)
             sprintf(umsg,"Data error in compressed datastream in %s chunk",

-                png_ptr->chunk_name);
+                (char *)png_ptr->chunk_name);

          else
             sprintf(umsg,"Incomplete compressed datastream in %s chunk",
          else
             sprintf(umsg,"Incomplete compressed datastream in %s chunk",

-                png_ptr->chunk_name);
+                (char *)png_ptr->chunk_name);

          png_warning(png_ptr, umsg);
 #else
          png_warning(png_ptr,
          png_warning(png_ptr, umsg);
 #else
          png_warning(png_ptr,