git.maemo.org Git - oespirit1/blob - gtk+/files/gtk+2.0-2.12.12/png-use-old-symbol.patch

   1 Index: sources/gtk+2.0-2.12.12/gdk-pixbuf/io-png.c
   2 ===================================================================
   3 --- gdk-pixbuf/io-png.c 2009-07-15 18:28:39.000000000 +0530
   4 +++ gdk-pixbuf/io-png.c 2009-07-16 02:10:44.000000000 +0530
   5 @@ -259,20 +259,22 @@
   6          gchar *key;
   7          gchar *value;
   8
   9 -#ifdef PNG_USER_MEM_SUPPORTED
  10 -       png_ptr = png_create_read_struct_2 (PNG_LIBPNG_VER_STRING,
  11 +// Temp. fix [15/07/09 18:30:19  Kirtika B Ruchandani <kirtibr@gmail.com>]
  12 +// Usage of png_create_read_struct_2 creates run-time problems
  13 +/*#ifdef PNG_USER_MEM_SUPPORTED
  14 +        png_ptr = png_create_read_struct_2 (PNG_LIBPNG_VER_STRING,
  15                                              error,
  16                                              png_simple_error_callback,
  17                                              png_simple_warning_callback,
  18                                              NULL,
  19                                              png_malloc_callback,
  20                                              png_free_callback);
  21 -#else
  22 +#else*/
  23         png_ptr = png_create_read_struct (PNG_LIBPNG_VER_STRING,
  24                                            error,
  25                                            png_simple_error_callback,
  26                                            png_simple_warning_callback);
  27 -#endif
  28 +//#endif
  29         if (!png_ptr)
  30                 return NULL;
  31
  32 @@ -422,20 +424,20 @@
  33
  34          /* Create the main PNG context struct */
  35
  36 -#ifdef PNG_USER_MEM_SUPPORTED
  37 +/*#ifdef PNG_USER_MEM_SUPPORTED
  38          lc->png_read_ptr = png_create_read_struct_2 (PNG_LIBPNG_VER_STRING,
  39 -                                                     lc, /* error/warning callback data */
  40 +                                                     lc,
  41                                                       png_error_callback,
  42                                                       png_warning_callback,
  43                                                       NULL,
  44                                                       png_malloc_callback,
  45                                                       png_free_callback);
  46 -#else
  47 +#else*/
  48          lc->png_read_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING,
  49                                                    lc, /* error/warning callback data */
  50                                                    png_error_callback,
  51                                                    png_warning_callback);
  52 -#endif
  53 +//#endif
  54          if (lc->png_read_ptr == NULL) {
  55                  g_free(lc);
  56                  /* error callback should have set the error */