stepmania-beta/libpng14.patch

   1 diff -Naur StepMania-3.9-src-old/src/RageSurface_Load_PNG.cpp StepMania-3.9-src/src/RageSurface_Load_PNG.cpp
   2 --- StepMania-3.9-src-old/src/RageSurface_Load_PNG.cpp  2005-10-01 06:32:44.000000000 +0300
   3 +++ StepMania-3.9-src/src/RageSurface_Load_PNG.cpp      2010-02-07 22:16:23.629067137 +0200
   4 @@ -46,7 +46,7 @@
   5  void RageFile_png_read( png_struct *png, png_byte *p, png_size_t size )
   6  {
   7         CHECKPOINT;
   8 -       RageFile *f = (RageFile *) png->io_ptr;
   9 +       RageFile *f = (RageFile *) png_get_io_ptr(png);
  10
  11         int got = f->Read( p, size );
  12         if( got == -1 )
  13 @@ -72,7 +72,7 @@
  14  void PNG_Error( png_struct *png, const char *error )
  15  {
  16         CHECKPOINT;
  17 -       error_info *info = (error_info *) png->error_ptr;
  18 +       error_info *info = (error_info *) png_get_error_ptr(png);
  19         strncpy( info->err, error, 1024 );
  20         info->err[1023] = 0;
  21         LOG->Trace( "loading \"%s\": err: %s", info->fn, info->err );
  22 @@ -82,7 +82,7 @@
  23  void PNG_Warning( png_struct *png, const char *warning )
  24  {
  25         CHECKPOINT;
  26 -       error_info *info = (error_info *) png->error_ptr;
  27 +       error_info *info = (error_info *) png_get_error_ptr(png);
  28         LOG->Trace( "loading \"%s\": warning: %s", info->fn, warning );
  29  }
  30
  31 @@ -139,7 +139,7 @@
  32
  33         /* Expand grayscale images to the full 8 bits from 1, 2, or 4 bits/pixel */
  34         if( color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8 )
  35 -               png_set_gray_1_2_4_to_8( png );
  36 +               png_set_expand_gray_1_2_4_to_8( png );
  37
  38         /* These are set for type == PALETTE. */
  39         RageSurfaceColor colors[256];