Annotation of pkgsrc/graphics/plotutils/patches/patch-aa, revision 1.6

1.6     ! wiz         1: $NetBSD$
1.1       tv          2: 
1.6     ! wiz         3: Fix build with png-1.5.
        !             4: 
        !             5: --- libplot/z_write.c.orig     2008-07-16 00:54:10.000000000 +0000
        !             6: +++ libplot/z_write.c
        !             7: @@ -164,7 +164,7 @@ _pl_z_maybe_output_image (S___(Plotter *
        !             8:      }
        !             9:  
        !            10:    /* cleanup after libpng errors (error handler does a longjmp) */
        !            11: -  if (setjmp (png_ptr->jmpbuf))
        !            12: +  if (setjmp (png_jmpbuf (png_ptr)))
        !            13:      {
        !            14:        png_destroy_write_struct (&png_ptr, (png_info **)NULL);
        !            15:        return -1;
        !            16: @@ -444,7 +444,11 @@ _our_error_fn_stdio (png_struct *png_ptr
        !            17:  #endif
        !            18:      }
        !            19:  
        !            20: +#if (PNG_LIBPNG_VER < 10500)
        !            21:    longjmp (png_ptr->jmpbuf, 1);
        !            22: +#else
        !            23: +  png_longjmp (png_ptr, 1);
        !            24: +#endif
        !            25:  }
        !            26:  
        !            27:  static void 
        !            28: @@ -515,7 +519,11 @@ _our_error_fn_stream (png_struct *png_pt
1.4       jmmv       29:  #endif
1.6     ! wiz        30:      }
        !            31:  
        !            32: +#if (PNG_LIBPNG_VER < 10500)
        !            33:    longjmp (png_ptr->jmpbuf, 1);
        !            34: +#else
        !            35: +  png_longjmp (png_ptr, 1);
        !            36: +#endif
        !            37:  }
1.1       tv         38:  
1.6     ! wiz        39:  static void 

CVSweb <webmaster@jp.NetBSD.org>