[mathmap] fix libpng15 patch

Nils Philippsen nphilipp at fedoraproject.org
Sat Dec 17 21:40:22 UTC 2011


commit 9b8c3992326a3a9bac647dfe5d042186d61c68db
Author: Nils Philippsen <nils at redhat.com>
Date:   Sat Dec 17 22:40:14 2011 +0100

    fix libpng15 patch

 mathmap-1.3.5-libpng15.patch |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/mathmap-1.3.5-libpng15.patch b/mathmap-1.3.5-libpng15.patch
index 091ab07..6e789b7 100644
--- a/mathmap-1.3.5-libpng15.patch
+++ b/mathmap-1.3.5-libpng15.patch
@@ -1,12 +1,12 @@
 diff -up mathmap-1.3.5/rwimg/rwpng.c.libpng15 mathmap-1.3.5/rwimg/rwpng.c
---- mathmap-1.3.5/rwimg/rwpng.c.libpng15	2009-08-23 13:56:14.000000000 +0200
-+++ mathmap-1.3.5/rwimg/rwpng.c	2011-12-16 19:08:51.048762219 +0100
+--- mathmap-1.3.5/rwimg/rwpng.c.libpng15	2011-12-17 18:28:19.022374990 +0100
++++ mathmap-1.3.5/rwimg/rwpng.c	2011-12-17 18:28:19.025374969 +0100
 @@ -58,7 +58,7 @@ open_png_file_reading (const char *filen
      data->end_info = png_create_info_struct(data->png_ptr);
      assert(data->end_info != 0);
  
 -    if (setjmp(data->png_ptr->jmpbuf))
-+    if (setjmp(png_get_jmpbuf(data->png_ptr)))
++    if (setjmp(png_jmpbuf(data->png_ptr)))
  	assert(0);
  
      png_init_io(data->png_ptr, data->file);
@@ -15,7 +15,7 @@ diff -up mathmap-1.3.5/rwimg/rwpng.c.libpng15 mathmap-1.3.5/rwimg/rwpng.c
      unsigned char *row;
  
 -    if (setjmp(data->png_ptr->jmpbuf))
-+    if (setjmp(png_get_jmpbuf(data->png_ptr)))
++    if (setjmp(png_jmpbuf(data->png_ptr)))
  	assert(0);
  
      if (data->info_ptr->color_type == PNG_COLOR_TYPE_GRAY)
@@ -24,7 +24,7 @@ diff -up mathmap-1.3.5/rwimg/rwpng.c.libpng15 mathmap-1.3.5/rwimg/rwpng.c
      png_data_t *data = (png_data_t*)_data;
  
 -    if (setjmp(data->png_ptr->jmpbuf))
-+    if (setjmp(png_get_jmpbuf(data->png_ptr)))
++    if (setjmp(png_jmpbuf(data->png_ptr)))
  	assert(0);
  
      if (data->have_read)
@@ -33,7 +33,7 @@ diff -up mathmap-1.3.5/rwimg/rwpng.c.libpng15 mathmap-1.3.5/rwimg/rwpng.c
      assert(data->info_ptr != 0);
  
 -    if (setjmp(data->png_ptr->jmpbuf))
-+    if (setjmp(png_get_jmpbuf(data->png_ptr)))
++    if (setjmp(png_jmpbuf(data->png_ptr)))
  	assert(0);
  
      if (pixel_stride == 4)
@@ -42,7 +42,7 @@ diff -up mathmap-1.3.5/rwimg/rwpng.c.libpng15 mathmap-1.3.5/rwimg/rwpng.c
      int i;
  
 -    if (setjmp(data->png_ptr->jmpbuf))
-+    if (setjmp(png_get_jmpbuf(data->png_ptr)))
++    if (setjmp(png_jmpbuf(data->png_ptr)))
  	assert(0);
  
      if (data->pixel_stride != 3)
@@ -51,7 +51,7 @@ diff -up mathmap-1.3.5/rwimg/rwpng.c.libpng15 mathmap-1.3.5/rwimg/rwpng.c
      png_data_t *data = (png_data_t*)_data;
  
 -    if (setjmp(data->png_ptr->jmpbuf))
-+    if (setjmp(png_get_jmpbuf(data->png_ptr)))
++    if (setjmp(png_jmpbuf(data->png_ptr)))
  	assert(0);
  
      png_write_end(data->png_ptr, data->info_ptr);


More information about the scm-commits mailing list