Changeset 98807


Ignore:
Timestamp:
Oct 17, 2012, 5:59:56 AM (12 years ago)
Author:
jmr@…
Message:

camlimages: more libpng 1.5 fixes (#35952)

Location:
trunk/dports/devel/camlimages
Files:
1 edited
1 moved

Legend:

Unmodified
Added
Removed

  • trunk/dports/devel/camlimages/Portfile

    r98806 r98807  
    1616homepage                        http://gallium.inria.fr/camlimages/
    1717
    18 patchfiles                      patch-src-jpegread.c.diff patch-pngwrite.c.diff
     18patchfiles                      patch-src-jpegread.c.diff patch-png.diff
    1919
    2020platforms                       darwin

  • trunk/dports/devel/camlimages/files/patch-png.diff

    r98806 r98807  
    1919     png_destroy_write_struct(&png_ptr, &info_ptr);
    2020     fclose(fp);
     21--- src/pngread.c.orig  2011-06-23 04:04:32.000000000 +1000
     22+++ src/pngread.c       2012-10-17 16:57:52.000000000 +1100
     23@@ -69,7 +69,7 @@ value read_png_file_as_rgb24( name )
     24   }
     25 
     26   /* error handling */
     27-  if (setjmp(png_ptr->jmpbuf)) {
     28+  if (setjmp(png_jmpbuf(png_ptr))) {
     29     /* Free all of the memory associated with the png_ptr and info_ptr */
     30     png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
     31     fclose(fp);
     32@@ -134,7 +134,7 @@ value read_png_file_as_rgb24( name )
     33     png_set_rows(png_ptr, info_ptr, row_pointers);
     34 
     35     /* Later, we can return something */
     36-    if (setjmp(png_ptr->jmpbuf)) {
     37+    if (setjmp(png_jmpbuf(png_ptr))) {
     38       /* Free all of the memory associated with the png_ptr and info_ptr */
     39       png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
     40       fclose(fp);
     41@@ -243,7 +243,7 @@ value read_png_file( name )
     42   }
     43 
     44   /* error handling */
     45-  if (setjmp(png_ptr->jmpbuf)) {
     46+  if (setjmp(png_jmpbuf(png_ptr))) {
     47     /* Free all of the memory associated with the png_ptr and info_ptr */
     48     png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
     49     fclose(fp);
     50@@ -302,7 +302,7 @@ value read_png_file( name )
     51     png_set_rows(png_ptr, info_ptr, row_pointers);
     52 
     53     /* Later, we can return something */
     54-    if (setjmp(png_ptr->jmpbuf)) {
     55+    if (setjmp(png_jmpbuf(png_ptr))) {
     56       /* Free all of the memory associated with the png_ptr and info_ptr */
     57       png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
     58       fclose(fp);
Note: See TracChangeset for help on using the changeset viewer.