Ticket #1860: patch-ad

File patch-ad, 1.3 KB (added by tk@…, 15 years ago)

Patch fixing the problem.

Line 
1$NetBSD: patch-ad,v 1.11 2011/01/14 10:44:27 wiz Exp $
2
3Fix build with png-1.5.
4
5--- libmpcodecs/vd_mpng.c.orig 2010-02-26 15:01:37.000000000 +0000
6+++ libmpcodecs/vd_mpng.c
7@@ -74,7 +74,7 @@ static int pngLength;
8
9 static void pngReadFN( png_structp pngstr,png_bytep buffer,png_size_t size )
10 {
11- char * p = pngstr->io_ptr;
12+ char * p = png_get_io_ptr(pngstr);
13 if(size>pngLength-pngPointer && pngLength>=pngPointer) size=pngLength-pngPointer;
14 fast_memcpy( buffer,(char *)&p[pngPointer],size );
15 pngPointer+=size;
16@@ -111,7 +111,7 @@ static mp_image_t* decode(sh_video_t *sh
17 png_get_IHDR( png,info,&png_width,&png_height,&depth,&color,NULL,NULL,NULL );
18 png_set_bgr( png );
19
20- switch( info->color_type ) {
21+ switch( png_get_color_type( png,info ) ) {
22 case PNG_COLOR_TYPE_GRAY_ALPHA:
23 mp_msg( MSGT_DECVIDEO,MSGL_INFO,"Sorry gray scaled png with alpha channel not supported at moment.\n" );
24 break;
25@@ -128,7 +128,7 @@ static mp_image_t* decode(sh_video_t *sh
26 out_fmt=IMGFMT_BGR24;
27 break;
28 default:
29- mp_msg( MSGT_DECVIDEO,MSGL_INFO,"Sorry, unsupported PNG colorspace: %d.\n" ,info->color_type);
30+ mp_msg( MSGT_DECVIDEO,MSGL_INFO,"Sorry, unsupported PNG colorspace: %d.\n" ,png_get_color_type( png,info ));
31 }
32
33 // (re)init libvo if image parameters changed (width/height/colorspace)