Start fixing for png-1.5, incomplete.

3 files changed, 361 insertions, 1 deletions

diff --git a/chat/amsn/distinfo b/chat/amsn/distinfo
index ab4fe3be8fe..b8283f461ea 100644
--- a/chat/amsn/distinfo
+++ b/chat/amsn/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.6 2010/05/12 21:27:01 rillig Exp $
+$NetBSD: distinfo,v 1.7 2011/04/03 15:26:36 wiz Exp $
 
 SHA1 (amsn-0.98.3-src.tar.bz2) = aa8383a11ce66352aceee27f9c291c1410b3403d
 RMD160 (amsn-0.98.3-src.tar.bz2) = 20f707062da4a5ab1eb6beec49d01dfd2ba90a99
 Size (amsn-0.98.3-src.tar.bz2) = 13275477 bytes
 SHA1 (patch-configure) = ddbd6a9616683c44202a551d734b2c9b10b2e05b
+SHA1 (patch-utils_TkCximage_src_CxImage_ximapng.cpp) = f8b7695ec8b5ce5730490fefc5f2e4b3d7e44e8a
+SHA1 (patch-utils_TkCximage_src_CxImage_ximapng.h) = 1d7a1cc0acd397629a0e6b1f83f9fdf943fb6d8a
diff --git a/chat/amsn/patches/patch-utils_TkCximage_src_CxImage_ximapng.cpp b/chat/amsn/patches/patch-utils_TkCximage_src_CxImage_ximapng.cpp
new file mode 100644
index 00000000000..5999298b7e6
--- /dev/null
+++ b/chat/amsn/patches/patch-utils_TkCximage_src_CxImage_ximapng.cpp
@@ -0,0 +1,341 @@
+$NetBSD: patch-utils_TkCximage_src_CxImage_ximapng.cpp,v 1.1 2011/04/03 15:26:36 wiz Exp $
+
+Fix build with png-1.5.
+
+--- utils/TkCximage/src/CxImage/ximapng.cpp.orig	2010-01-29 09:09:27.000000000 +0000
++++ utils/TkCximage/src/CxImage/ximapng.cpp
+@@ -15,7 +15,7 @@
+ void CxImagePNG::ima_png_error(png_struct *png_ptr, char *message)
+ {
+ 	strcpy(info.szLastError,message);
+-	longjmp(png_ptr->jmpbuf, 1);
++	longjmp(png_jmpbuf(png_ptr), 1);
+ }
+ ////////////////////////////////////////////////////////////////////////////////
+ #if CXIMAGE_SUPPORT_DECODE
+@@ -62,7 +62,7 @@ bool CxImagePNG::Decode(CxFile *hFile)
+     /* Set error handling if you are using the setjmp/longjmp method (this is
+     * the normal method of doing things with libpng).  REQUIRED unless you
+     * set up your own error handlers in the png_create_read_struct() earlier. */
+-	if (setjmp(png_ptr->jmpbuf)) {
++	if (setjmp(png_jmpbuf(png_ptr))) {
+ 		/* Free all of the memory associated with the png_ptr and info_ptr */
+ 		delete [] row_pointers;
+ 		png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
+@@ -77,15 +77,15 @@ bool CxImagePNG::Decode(CxFile *hFile)
+ 	png_read_info(png_ptr, info_ptr);
+ 
+ 	if (info.nEscape == -1){
+-		head.biWidth = info_ptr->width;
+-		head.biHeight= info_ptr->height;
++		head.biWidth = png_get_image_width(png_ptr, info_ptr);
++		head.biHeight= png_get_image_height(png_ptr, info_ptr);
+ 		info.dwType = CXIMAGE_FORMAT_PNG;
+-		longjmp(png_ptr->jmpbuf, 1);
++		longjmp(png_jmpbuf(png_ptr), 1);
+ 	}
+ 
+ 	/* calculate new number of channels */
+ 	int channels=0;
+-	switch(info_ptr->color_type){
++	switch(png_get_color_type(png_ptr, info_ptr)){
+ 	case PNG_COLOR_TYPE_GRAY:
+ 	case PNG_COLOR_TYPE_PALETTE:
+ 		channels = 1;
+@@ -101,71 +101,76 @@ bool CxImagePNG::Decode(CxFile *hFile)
+ 		break;
+ 	default:
+ 		strcpy(info.szLastError,"unknown PNG color type");
+-		longjmp(png_ptr->jmpbuf, 1);
++		longjmp(png_jmpbuf(png_ptr), 1);
+ 	}
+ 
+ 	//find the right pixel depth used for cximage
+-	int pixel_depth = info_ptr->pixel_depth;
++#if MIGHT_BE_BUGGY
++	int pixel_depth = png_get_pixel_depth(png_ptr, info_ptr);
+ 	if (channels == 1 && pixel_depth>8) pixel_depth=8;
++#endif
++	int pixel_depth;
++	if (channels == 1) pixel_depth=8;
+ 	if (channels == 2) pixel_depth=8;
+ 	if (channels >= 3) pixel_depth=24;
+ 
+-	if (!Create(info_ptr->width, info_ptr->height, pixel_depth, CXIMAGE_FORMAT_PNG)){
+-		longjmp(png_ptr->jmpbuf, 1);
++	if (!Create(png_get_image_width(png_ptr, info_ptr), png_get_image_height(png_ptr, info_ptr), pixel_depth, CXIMAGE_FORMAT_PNG)){
++		longjmp(png_jmpbuf(png_ptr), 1);
+ 	}
+ 
+ 	/* get metrics */
+-	switch (info_ptr->phys_unit_type)
++	png_uint_32 res_x, res_y;
++	int unit_type;
++	png_get_pHYs_dpi(png_ptr, info_ptr, &res_x, &res_y, &unit_type);
++	switch (unit_type)
+ 	{
+ 	case PNG_RESOLUTION_UNKNOWN:
+-		SetXDPI(info_ptr->x_pixels_per_unit);
+-		SetYDPI(info_ptr->y_pixels_per_unit);
++		SetXDPI(res_x);
++		SetYDPI(res_y);
+ 		break;
+ 	case PNG_RESOLUTION_METER:
+-		SetXDPI((long)floor(info_ptr->x_pixels_per_unit * 254.0 / 10000.0 + 0.5));
+-		SetYDPI((long)floor(info_ptr->y_pixels_per_unit * 254.0 / 10000.0 + 0.5));
++		SetXDPI((long)floor(res_x * 254.0 / 10000.0 + 0.5));
++		SetYDPI((long)floor(res_y * 254.0 / 10000.0 + 0.5));
+ 		break;
+ 	}
+ 
+-	if (info_ptr->num_palette>0){
+-		SetPalette((rgb_color*)info_ptr->palette,info_ptr->num_palette);
+-		SetClrImportant(info_ptr->num_palette);
+-	} else if (info_ptr->bit_depth ==2) { //<DP> needed for 2 bpp grayscale PNGs
++	png_colorp palette;
++	int num_palette;
++	png_get_PLTE(png_ptr, info_ptr, &palette, &num_palette);
++	if (num_palette>0){
++		SetPalette((rgb_color*)palette,num_palette);
++		SetClrImportant(num_palette);
++	} else if (png_get_bit_depth(png_ptr, info_ptr) ==2) { //<DP> needed for 2 bpp grayscale PNGs
+ 		SetPaletteColor(0,0,0,0);
+ 		SetPaletteColor(1,85,85,85);
+ 		SetPaletteColor(2,170,170,170);
+ 		SetPaletteColor(3,255,255,255);
+ 	} else SetGrayPalette(); //<DP> needed for grayscale PNGs
+ 	
+-	int nshift = max(0,(info_ptr->bit_depth>>3)-1)<<3;
++	int nshift = max(0,(png_get_bit_depth(png_ptr, info_ptr)>>3)-1)<<3;
+ 
+-	if (info_ptr->num_trans!=0){ //palette transparency
+-		if (info_ptr->num_trans==1){
+-			if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE){
+-#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
+-				info.nBkgndIndex = info_ptr->trans_color.index;
+-#else
+-				info.nBkgndIndex = info_ptr->trans_values.index;
+-#endif
++png_uint_32    png_get_tRNS   (png_const_structp   png_ptr,   png_infop
++info_ptr,  png_bytep  *trans_alpha,   int   *num_trans,   png_color_16p
++*trans_color);
++	png_bytep trans_alpha;
++	int num_trans;
++	png_color_16p trans_color;
++	png_get_tRNS(png_ptr, info_ptr, &trans_alpha, &num_trans, &trans_color);
++	if (num_trans!=0){ //palette transparency
++		if (num_trans==1){
++			if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_PALETTE){
++				info.nBkgndIndex = trans_color->index;
+ 			} else{
+-#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
+-				info.nBkgndIndex = info_ptr->trans_color.gray>>nshift;
+-#else
+-				info.nBkgndIndex = info_ptr->trans_values.gray>>nshift;
+-#endif
++				info.nBkgndIndex = trans_color->gray>>nshift;
+ 			}
+ 		}
+-		if (info_ptr->num_trans>1){
++		if (num_trans>1){
+ 			RGBQUAD* pal=GetPalette();
+ 			if (pal){
+ 				DWORD ip;
+-				for (ip=0;ip<min(head.biClrUsed,(unsigned long)info_ptr->num_trans);ip++)
+-#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
+-					pal[ip].rgbReserved=info_ptr->trans_alpha[ip];
+-#else
+-					pal[ip].rgbReserved=info_ptr->trans[ip];
+-#endif
+-				for (ip=info_ptr->num_trans;ip<head.biClrUsed;ip++){
++				for (ip=0;ip<min(head.biClrUsed,(unsigned long)num_trans);ip++)
++					pal[ip].rgbReserved=trans_alpha[ip];
++				for (ip=num_trans;ip<head.biClrUsed;ip++){
+ 					pal[ip].rgbReserved=255;
+ 				}
+ 				info.bAlphaPaletteEnabled=true;
+@@ -178,15 +183,9 @@ bool CxImagePNG::Decode(CxFile *hFile)
+ 		int num_trans;
+ 		png_color_16 *image_background;
+ 		if (png_get_tRNS(png_ptr, info_ptr, &trans, &num_trans, &image_background)){
+-#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
+-			info.nBkgndColor.rgbRed   = (BYTE)(info_ptr->trans_color.red>>nshift);
+-			info.nBkgndColor.rgbGreen = (BYTE)(info_ptr->trans_color.green>>nshift);
+-			info.nBkgndColor.rgbBlue  = (BYTE)(info_ptr->trans_color.blue>>nshift);
+-#else
+-			info.nBkgndColor.rgbRed   = (BYTE)(info_ptr->trans_values.red>>nshift);
+-			info.nBkgndColor.rgbGreen = (BYTE)(info_ptr->trans_values.green>>nshift);
+-			info.nBkgndColor.rgbBlue  = (BYTE)(info_ptr->trans_values.blue>>nshift);
+-#endif
++			info.nBkgndColor.rgbRed   = (BYTE)(trans_color->red>>nshift);
++			info.nBkgndColor.rgbGreen = (BYTE)(trans_color->green>>nshift);
++			info.nBkgndColor.rgbBlue  = (BYTE)(trans_color->blue>>nshift);
+ 			info.nBkgndColor.rgbReserved = 0;
+ 			info.nBkgndIndex = 0;
+ 		}
+@@ -202,15 +201,15 @@ bool CxImagePNG::Decode(CxFile *hFile)
+ 	}
+ 
+ 	// <vho> - flip the RGB pixels to BGR (or RGBA to BGRA)
+-	if (info_ptr->color_type & PNG_COLOR_MASK_COLOR){
++	if (png_get_color_type(png_ptr, info_ptr) & PNG_COLOR_MASK_COLOR){
+ 		png_set_bgr(png_ptr);
+ 	}
+ 
+ 	// <vho> - handle cancel
+-	if (info.nEscape) longjmp(png_ptr->jmpbuf, 1);
++	if (info.nEscape) longjmp(png_jmpbuf(png_ptr), 1);
+ 
+ 	// row_bytes is the width x number of channels x (bit-depth / 8)
+-	row_pointers = new BYTE[info_ptr->rowbytes + 8];
++	row_pointers = new BYTE[png_get_rowbytes(png_ptr, info_ptr) + 8];
+ 
+ 	// turn on interlace handling
+ 	int number_passes = png_set_interlace_handling(png_ptr);
+@@ -221,7 +220,7 @@ bool CxImagePNG::Decode(CxFile *hFile)
+ 		SetCodecOption(0);
+ 	}
+ 
+-	int chan_offset = info_ptr->bit_depth >> 3;
++	int chan_offset = png_get_bit_depth(png_ptr, info_ptr) >> 3;
+ 	int pixel_offset = info_ptr->pixel_depth >> 3;
+ 
+ 	for (int pass=0; pass < number_passes; pass++) {
+@@ -230,7 +229,7 @@ bool CxImagePNG::Decode(CxFile *hFile)
+ 		do	{
+ 
+ 			// <vho> - handle cancel
+-			if (info.nEscape) longjmp(png_ptr->jmpbuf, 1);
++			if (info.nEscape) longjmp(png_jmpbuf(png_ptr), 1);
+ 
+ #if CXIMAGE_SUPPORT_ALPHA	// <vho>
+ 			if (AlphaIsValid()) {
+@@ -281,7 +280,7 @@ bool CxImagePNG::Decode(CxFile *hFile)
+ 				if (info_ptr->interlace_type && pass>0){
+ 					iter.GetRow(row_pointers, info_ptr->rowbytes);
+ 					//re-expand buffer for images with bit depth > 8
+-					if (info_ptr->bit_depth > 8){
++					if (png_get_bit_depth(png_ptr, info_ptr) > 8){
+ 						for(long ax=(head.biWidth*channels-1);ax>=0;ax--)
+ 							row_pointers[ax*chan_offset] = row_pointers[ax];
+ 					}
+@@ -291,7 +290,7 @@ bool CxImagePNG::Decode(CxFile *hFile)
+ 				png_read_row(png_ptr, row_pointers, NULL);
+ 
+ 				//shrink 16 bit depth images down to 8 bits
+-				if (info_ptr->bit_depth > 8){
++				if (png_get_bit_depth(png_ptr, info_ptr) > 8){
+ 					for(long ax=0;ax<(head.biWidth*channels);ax++)
+ 						row_pointers[ax] = row_pointers[ax*chan_offset];
+ 				}
+@@ -299,7 +298,7 @@ bool CxImagePNG::Decode(CxFile *hFile)
+ 				//copy the pixels
+ 				iter.SetRow(row_pointers, info_ptr->rowbytes);
+ 				//<DP> expand 2 bpp images only in the last pass
+-				if (info_ptr->bit_depth==2 && pass==(number_passes-1))
++				if (png_get_bit_depth(png_ptr, info_ptr)==2 && pass==(number_passes-1))
+ 					expand2to4bpp(iter.GetRow());
+ 
+ 				//go on
+@@ -362,7 +361,7 @@ bool CxImagePNG::Encode(CxFile *hFile)
+    /* Set error handling.  REQUIRED if you aren't supplying your own
+     * error hadnling functions in the png_create_write_struct() call.
+     */
+-	if (setjmp(png_ptr->jmpbuf)){
++	if (setjmp(png_jmpbuf(png_ptr))){
+ 		/* If we get here, we had a problem reading the file */
+ 		if (info_ptr->palette) free(info_ptr->palette);
+ 		png_destroy_write_struct(&png_ptr,  (png_infopp)&info_ptr);
+@@ -376,11 +375,11 @@ bool CxImagePNG::Encode(CxFile *hFile)
+     png_set_write_fn(png_ptr,hFile,/*(png_rw_ptr)*/user_write_data,/*(png_flush_ptr)*/user_flush_data);
+ 
+ 	/* set the file information here */
+-	info_ptr->width = GetWidth();
++	png_get_image_width(png_ptr, info_ptr) = GetWidth();
+ 	info_ptr->height = GetHeight();
+ 	info_ptr->pixel_depth = (BYTE)GetBpp();
+-	info_ptr->channels = (GetBpp()>8) ? (BYTE)3: (BYTE)1;
+-	info_ptr->bit_depth = (BYTE)(GetBpp()/info_ptr->channels);
++	png_get_channels(png_ptr, info_ptr) = (GetBpp()>8) ? (BYTE)3: (BYTE)1;
++	png_get_bit_depth(png_ptr, info_ptr) = (BYTE)(GetBpp()/png_get_channels(png_ptr, info_ptr));
+ 	info_ptr->compression_type = info_ptr->filter_type = 0;
+ 	info_ptr->valid = 0;
+ 
+@@ -399,18 +398,18 @@ bool CxImagePNG::Encode(CxFile *hFile)
+ 
+ 	if (GetNumColors()){
+ 		if (bGrayScale){
+-			info_ptr->color_type = PNG_COLOR_TYPE_GRAY;
++			png_get_color_type(png_ptr, info_ptr) = PNG_COLOR_TYPE_GRAY;
+ 		} else {
+-			info_ptr->color_type = PNG_COLOR_TYPE_PALETTE;
++			png_get_color_type(png_ptr, info_ptr) = PNG_COLOR_TYPE_PALETTE;
+ 		}
+ 	} else {
+-		info_ptr->color_type = PNG_COLOR_TYPE_RGB;
++		png_get_color_type(png_ptr, info_ptr) = PNG_COLOR_TYPE_RGB;
+ 	}
+ #if CXIMAGE_SUPPORT_ALPHA
+ 	if (AlphaIsValid()){
+-		info_ptr->color_type |= PNG_COLOR_MASK_ALPHA;
+-		info_ptr->channels++;
+-		info_ptr->bit_depth = 8;
++		png_get_color_type(png_ptr, info_ptr) |= PNG_COLOR_MASK_ALPHA;
++		png_get_channels(png_ptr, info_ptr)++;
++		png_get_bit_depth(png_ptr, info_ptr) = 8;
+ 		info_ptr->pixel_depth += 8;
+ 	}
+ #endif
+@@ -428,8 +427,8 @@ bool CxImagePNG::Encode(CxFile *hFile)
+ 	/* set metrics */
+ 	png_set_pHYs(png_ptr, info_ptr, head.biXPelsPerMeter, head.biYPelsPerMeter, PNG_RESOLUTION_METER);
+ 
+-	png_set_IHDR(png_ptr, info_ptr, info_ptr->width, info_ptr->height, info_ptr->bit_depth,
+-				info_ptr->color_type, info_ptr->interlace_type,
++	png_set_IHDR(png_ptr, info_ptr, png_get_image_width(png_ptr, info_ptr), info_ptr->height, png_get_bit_depth(png_ptr, info_ptr),
++				png_get_color_type(png_ptr, info_ptr), info_ptr->interlace_type,
+ 				PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
+ 
+ 	//<DP> simple transparency
+@@ -469,13 +468,7 @@ bool CxImagePNG::Encode(CxFile *hFile)
+ 		if (info.bAlphaPaletteEnabled){
+ 			for(WORD ip=0; ip<nc;ip++)
+ 				trans[ip]=GetPaletteColor((BYTE)ip).rgbReserved;
+-			info_ptr->num_trans = (WORD)nc;
+-			info_ptr->valid |= PNG_INFO_tRNS;
+-#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
+-			info_ptr->trans_alpha = trans;
+-#else
+-			info_ptr->trans = trans;
+-#endif
++			png_set_tRNS(png_ptr, info_ptr, trans, (WORD)nc, NULL);
+ 		}
+ 
+ 		// copy the palette colors
+@@ -496,7 +489,7 @@ bool CxImagePNG::Encode(CxFile *hFile)
+ 	}	}	}
+ #endif // CXIMAGE_SUPPORT_ALPHA	// <vho>
+ 
+-	int row_size = max(info.dwEffWidth, info_ptr->width*info_ptr->channels*(info_ptr->bit_depth/8));
++	int row_size = max(info.dwEffWidth, png_get_image_width(png_ptr, info_ptr)*png_get_channels(png_ptr, info_ptr)*(png_get_bit_depth(png_ptr, info_ptr)/8));
+ 	info_ptr->rowbytes = row_size;
+ 	BYTE *row_pointers = new BYTE[row_size];
+ 
+@@ -515,7 +508,7 @@ bool CxImagePNG::Encode(CxFile *hFile)
+ 			if (AlphaIsValid()){
+ 				for (long ax=head.biWidth-1; ax>=0;ax--){
+ 					c = BlindGetPixelColor(ax,ay);
+-					int px = ax * info_ptr->channels;
++					int px = ax * png_get_channels(png_ptr, info_ptr);
+ 					if (!bGrayScale){
+ 						row_pointers[px++]=c.rgbRed;
+ 						row_pointers[px++]=c.rgbGreen;
+@@ -530,7 +523,7 @@ bool CxImagePNG::Encode(CxFile *hFile)
+ #endif //CXIMAGE_SUPPORT_ALPHA	// <vho>
+ 			{
+ 				iter.GetRow(row_pointers, row_size);
+-				if (info_ptr->color_type == PNG_COLOR_TYPE_RGB) //HACK BY OP
++				if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_RGB) //HACK BY OP
+ 					RGBtoBGR(row_pointers, row_size);
+ 				png_write_row(png_ptr, row_pointers);
+ 			}
diff --git a/chat/amsn/patches/patch-utils_TkCximage_src_CxImage_ximapng.h b/chat/amsn/patches/patch-utils_TkCximage_src_CxImage_ximapng.h
new file mode 100644
index 00000000000..509481465f9
--- /dev/null
+++ b/chat/amsn/patches/patch-utils_TkCximage_src_CxImage_ximapng.h
@@ -0,0 +1,17 @@
+$NetBSD: patch-utils_TkCximage_src_CxImage_ximapng.h,v 1.1 2011/04/03 15:26:36 wiz Exp $
+
+Fix build with png-1.5.
+
+--- utils/TkCximage/src/CxImage/ximapng.h.orig	2008-03-07 19:14:37.000000000 +0000
++++ utils/TkCximage/src/CxImage/ximapng.h
+@@ -64,8 +64,8 @@ protected:
+ 
+     static void PNGAPI user_error_fn(png_structp png_ptr,png_const_charp error_msg)
+ 	{
+-		strncpy((char*)png_ptr->error_ptr,error_msg,255);
+-		longjmp(png_ptr->jmpbuf, 1);
++		strncpy((char*)png_get_error_ptr(png_ptr),error_msg,255);
++		longjmp(png_jmpbuf(png_ptr), 1);
+ 	}
+ };
+