code.vuplus.com Git - vuplus_openvuplus_3.0/blob - meta-openvuplus/recipes-vuplus/enigma2/enigma2/enigma2_vuplus_epng.patch

   1 diff --git a/lib/gdi/epng.cpp b/lib/gdi/epng.cpp
   2 index d8c1982..2ba5a12 100644
   3 --- a/lib/gdi/epng.cpp
   4 +++ b/lib/gdi/epng.cpp
   5 @@ -1,4 +1,5 @@
   6  #define PNG_SKIP_SETJMP_CHECK
   7 +#include <zlib.h>
   8  #include <png.h>
   9  #include <stdio.h>
  10  #include <lib/gdi/epng.h>
  11 @@ -52,7 +53,7 @@ int loadPNG(ePtr<gPixmap> &result, const char *filename)
  12                 fclose(fp);
  13                 return 0;
  14          }
  15 -       if (setjmp(png_ptr->jmpbuf))
  16 +       if ( setjmp(png_jmpbuf(png_ptr)) )
  17         {
  18                 eDebug("das war wohl nix");
  19                 png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
  20 @@ -145,7 +146,7 @@ int loadPNG(ePtr<gPixmap> &result, const char *filename)
  21                 for (pass = 0; pass < number_passes; pass++)
  22                         for (int y = 0; y < height; y++)
  23                         {
  24 -                               png_read_rows(png_ptr, &rowptr[y], png_bytepp_NULL, 1);
  25 +                               png_read_rows(png_ptr, &rowptr[y], NULL, 1);
  26                         }
  27
  28  /*
  29 @@ -323,7 +324,7 @@ int savePNG(const char *filename, gPixmap *pixmap)
  30                 PNG_COLOR_TYPE_RGB_ALPHA,
  31                 PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT);
  32
  33 -       if (setjmp(png_ptr->jmpbuf))
  34 +       if ( setjmp(png_jmpbuf(png_ptr)) )
  35         {
  36                 eDebug("error :/");
  37                 png_destroy_write_struct(&png_ptr, &info_ptr);
  38 diff --git a/lib/gdi/picload.cpp b/lib/gdi/picload.cpp
  39 index 2afebd5..ab7a0b5 100644
  40 --- a/lib/gdi/picload.cpp
  41 +++ b/lib/gdi/picload.cpp
  42 @@ -280,7 +280,7 @@ static unsigned char *png_load(const char *file, int *ox, int *oy, int *_bypp)
  43                 return NULL;
  44         }
  45
  46 -       if (setjmp(png_ptr->jmpbuf))
  47 +       if (setjmp(png_jmpbuf(png_ptr)))
  48         {
  49                 png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
  50                 fclose(fh);