From 986e422f3c103aefccc54e40c21cf1b9a6143a04 Mon Sep 17 00:00:00 2001 From: wiz Date: Tue, 1 Feb 2011 10:27:39 +0000 Subject: Fix build with png-1.5. --- graphics/panomatic/distinfo | 4 +- graphics/panomatic/patches/patch-ad | 217 +++++++++++++++++++++++++++++++++++- 2 files changed, 216 insertions(+), 5 deletions(-) (limited to 'graphics/panomatic') diff --git a/graphics/panomatic/distinfo b/graphics/panomatic/distinfo index ef874c55edc..c946ece0d45 100644 --- a/graphics/panomatic/distinfo +++ b/graphics/panomatic/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.2 2010/06/13 22:44:40 wiz Exp $ +$NetBSD: distinfo,v 1.3 2011/02/01 10:27:39 wiz Exp $ SHA1 (panomatic-0.9.4-src.tar.bz2) = cc0a48d81d090ec90e134afba4b9e700a5843f09 RMD160 (panomatic-0.9.4-src.tar.bz2) = 14ad37420733f950b8f7640c2e7f0b3fe593af89 @@ -6,5 +6,5 @@ Size (panomatic-0.9.4-src.tar.bz2) = 1598683 bytes SHA1 (patch-aa) = 0c30ac34a9f678083c0bc3353f0171c0d3f5bdfa SHA1 (patch-ab) = 316d23c740ee23e35b7b2f4ae8c0cc1b87c47ccb SHA1 (patch-ac) = 2fa2168a257b60ae194675e3b0abd00bf6c7799b -SHA1 (patch-ad) = 9acda36b6ad47584177f4035a78719229132b905 +SHA1 (patch-ad) = da2fdad2c8dd225f49f74d1f7c212f1b90babd08 SHA1 (patch-ba) = 65fd25c9ae6fd22046a050687154940ab41849b7 diff --git a/graphics/panomatic/patches/patch-ad b/graphics/panomatic/patches/patch-ad index d45fac74db6..424b489976b 100644 --- a/graphics/panomatic/patches/patch-ad +++ b/graphics/panomatic/patches/patch-ad @@ -1,15 +1,226 @@ -$NetBSD: patch-ad,v 1.1 2010/06/13 22:44:40 wiz Exp $ +$NetBSD: patch-ad,v 1.2 2011/02/01 10:27:39 wiz Exp $ + +Fix build with png-1.5. --- vigra/src/impex/png.cxx.orig 2008-02-14 23:14:15.000000000 +0000 +++ vigra/src/impex/png.cxx -@@ -270,8 +270,8 @@ namespace vigra { +@@ -77,7 +77,11 @@ extern "C" { + static void PngError( png_structp png_ptr, png_const_charp error_msg ) + { + png_error_message = std::string(error_msg); ++#if (PNG_LIBPNG_VER < 10500) + longjmp( png_ptr->jmpbuf, 1 ); ++#else ++ png_longjmp( png_ptr, 1 ); ++#endif + } + + // called on non-fatal errors +@@ -209,7 +213,7 @@ namespace vigra { + vigra_postcondition( png != 0, "could not create the read struct." ); + + // create info struct +- if (setjmp(png->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png))) { + png_destroy_read_struct( &png, &info, NULL ); + vigra_postcondition( false, png_error_message.insert(0, "error in png_create_info_struct(): ").c_str() ); + } +@@ -217,14 +221,14 @@ namespace vigra { + vigra_postcondition( info != 0, "could not create the info struct." ); + + // init png i/o +- if (setjmp(png->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png))) { + png_destroy_read_struct( &png, &info, NULL ); + vigra_postcondition( false, png_error_message.insert(0, "error in png_init_io(): ").c_str() ); + } + png_init_io( png, file.get() ); + + // specify that the signature was already read +- if (setjmp(png->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png))) { + png_destroy_read_struct( &png, &info, NULL ); + vigra_postcondition( false, png_error_message.insert(0, "error in png_set_sig_bytes(): ").c_str() ); + } +@@ -240,13 +244,13 @@ namespace vigra { + void PngDecoderImpl::init() + { + // read all chunks up to the image data +- if (setjmp(png->jmpbuf)) ++ if (setjmp(png_jmpbuf(png))) + vigra_postcondition( false, png_error_message.insert(0, "error in png_read_info(): ").c_str() ); + png_read_info( png, info ); + + // pull over the header fields + int interlace_method, compression_method, filter_method; +- if (setjmp(png->jmpbuf)) ++ if (setjmp(png_jmpbuf(png))) + vigra_postcondition( false, png_error_message.insert(0, "error in png_get_IHDR(): ").c_str() ); + png_get_IHDR( png, info, &width, &height, &bit_depth, &color_type, + &interlace_method, &compression_method, &filter_method ); +@@ -260,7 +264,7 @@ namespace vigra { + + // transform palette to rgb + if ( color_type == PNG_COLOR_TYPE_PALETTE) { +- if (setjmp(png->jmpbuf)) ++ if (setjmp(png_jmpbuf(png))) + vigra_postcondition( false, png_error_message.insert(0, "error in png_palette_to_rgb(): ").c_str() ); + png_set_palette_to_rgb(png); + color_type = PNG_COLOR_TYPE_RGB; +@@ -269,9 +273,9 @@ namespace vigra { + // expand gray values to at least one byte size if ( color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8 ) { - if (setjmp(png->jmpbuf)) +- if (setjmp(png->jmpbuf)) - vigra_postcondition( false,png_error_message.insert(0, "error in png_set_gray_1_2_4_to_8(): ").c_str()); - png_set_gray_1_2_4_to_8(png); ++ if (setjmp(png_jmpbuf(png))) + vigra_postcondition( false,png_error_message.insert(0, "error in png_set_expand_gray_1_2_4_to_8(): ").c_str()); + png_set_expand_gray_1_2_4_to_8(png); bit_depth = 8; } +@@ -279,7 +283,7 @@ namespace vigra { + #if 0 + // strip alpha channel + if ( color_type & PNG_COLOR_MASK_ALPHA ) { +- if (setjmp(png->jmpbuf)) ++ if (setjmp(png_jmpbuf(png))) + vigra_postcondition( false, png_error_message.insert(0, "error in png_set_strip_alpha(): ").c_str() ); + png_set_strip_alpha(png); + color_type ^= PNG_COLOR_MASK_ALPHA; +@@ -321,9 +325,9 @@ namespace vigra { + #if (PNG_LIBPNG_VER > 10008) && defined(PNG_READ_iCCP_SUPPORTED) + char * dummyName; + int dummyCompType; +- char * profilePtr; ++ png_bytep profilePtr; + png_uint_32 profileLen; +- if (info->valid & PNG_INFO_iCCP) { ++ if (png_get_valid(png, info, PNG_INFO_iCCP)) { + png_get_iCCP(png, info, &dummyName, &dummyCompType, &profilePtr, &profileLen) ; + iccProfilePtr = (unsigned char *) profilePtr; + iccProfileLength = profileLen; +@@ -336,7 +340,7 @@ namespace vigra { + // image gamma + double image_gamma = 0.45455; + if ( png_get_valid( png, info, PNG_INFO_gAMA ) ) { +- if (setjmp(png->jmpbuf)) ++ if (setjmp(png_jmpbuf(png))) + vigra_postcondition( false, png_error_message.insert(0, "error in png_get_gAMA(): ").c_str() ); + png_get_gAMA( png, info, &image_gamma ); + } +@@ -345,26 +349,26 @@ namespace vigra { + double screen_gamma = 2.2; + + // set gamma correction +- if (setjmp(png->jmpbuf)) ++ if (setjmp(png_jmpbuf(png))) + vigra_postcondition( false, png_error_message.insert(0, "error in png_set_gamma(): ").c_str() ); + png_set_gamma( png, screen_gamma, image_gamma ); + #endif + + // interlace handling, get number of read passes needed +- if (setjmp(png->jmpbuf)) ++ if (setjmp(png_jmpbuf(png))) + vigra_postcondition( false,png_error_message.insert(0, "error in png_set_interlace_handling(): ").c_str()); + n_interlace_passes = png_set_interlace_handling(png); + + // update png library state to reflect any changes that were made +- if (setjmp(png->jmpbuf)) ++ if (setjmp(png_jmpbuf(png))) + vigra_postcondition( false, png_error_message.insert(0, "error in png_read_update_info(): ").c_str() ); + png_read_update_info( png, info ); + +- if (setjmp(png->jmpbuf)) ++ if (setjmp(png_jmpbuf(png))) + vigra_postcondition( false,png_error_message.insert(0, "error in png_get_channels(): ").c_str()); + n_channels = png_get_channels(png, info); + +- if (setjmp(png->jmpbuf)) ++ if (setjmp(png_jmpbuf(png))) + vigra_postcondition( false,png_error_message.insert(0, "error in png_get_rowbytes(): ").c_str()); + rowsize = png_get_rowbytes(png, info); + +@@ -375,7 +379,7 @@ namespace vigra { + void PngDecoderImpl::nextScanline() + { + for (int i=0; i < n_interlace_passes; i++) { +- if (setjmp(png->jmpbuf)) ++ if (setjmp(png_jmpbuf(png))) + vigra_postcondition( false,png_error_message.insert(0, "error in png_read_row(): ").c_str()); + png_read_row(png, row_data.begin(), NULL); + } +@@ -541,7 +545,7 @@ namespace vigra { + vigra_postcondition( png != 0, "could not create the write struct." ); + + // create info struct +- if (setjmp(png->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png))) { + png_destroy_write_struct( &png, &info ); + vigra_postcondition( false, png_error_message.insert(0, "error in png_info_struct(): ").c_str() ); + } +@@ -552,7 +556,7 @@ namespace vigra { + } + + // init png i/o +- if (setjmp(png->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png))) { + png_destroy_write_struct( &png, &info ); + vigra_postcondition( false, png_error_message.insert(0, "error in png_init_io(): ").c_str() ); + } +@@ -567,7 +571,7 @@ namespace vigra { + void PngEncoderImpl::finalize() + { + // write the IHDR +- if (setjmp(png->jmpbuf)) ++ if (setjmp(png_jmpbuf(png))) + vigra_postcondition( false, png_error_message.insert(0, "error in png_set_IHDR(): ").c_str() ); + png_set_IHDR( png, info, width, height, bit_depth, color_type, + PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT, +@@ -575,7 +579,7 @@ namespace vigra { + + // set resolution + if (x_resolution > 0 && y_resolution > 0) { +- if (setjmp(png->jmpbuf)) ++ if (setjmp(png_jmpbuf(png))) + vigra_postcondition( false, png_error_message.insert(0, "error in png_set_pHYs(): ").c_str() ); + png_set_pHYs(png, info, (png_uint_32) (x_resolution * 254 + 0.5), + (png_uint_32) (y_resolution * 254 + 0.5), +@@ -584,7 +588,7 @@ namespace vigra { + + // set offset + if (position.x > 0 && position.y > 0) { +- if (setjmp(png->jmpbuf)) ++ if (setjmp(png_jmpbuf(png))) + vigra_postcondition( false, png_error_message.insert(0, "error in png_set_oFFs(): ").c_str() ); + png_set_oFFs(png, info, position.x, position.y, PNG_OFFSET_PIXEL); + } +@@ -593,12 +597,12 @@ namespace vigra { + // set icc profile + if (iccProfile.size() > 0) { + png_set_iCCP(png, info, "icc", 0, +- (char *)iccProfile.begin(), iccProfile.size()); ++ (png_bytep)iccProfile.begin(), iccProfile.size()); + } + #endif + + // write the info struct +- if (setjmp(png->jmpbuf)) ++ if (setjmp(png_jmpbuf(png))) + vigra_postcondition( false, png_error_message.insert(0, "error in png_write_info(): ").c_str() ); + png_write_info( png, info ); + +@@ -630,10 +634,10 @@ namespace vigra { + } + + // write the whole image +- if (setjmp(png->jmpbuf)) ++ if (setjmp(png_jmpbuf(png))) + vigra_postcondition( false, png_error_message.insert(0, "error in png_write_image(): ").c_str() ); + png_write_image( png, row_pointers.begin() ); +- if (setjmp(png->jmpbuf)) ++ if (setjmp(png_jmpbuf(png))) + vigra_postcondition( false, png_error_message.insert(0, "error in png_write_end(): ").c_str() ); + png_write_end(png, info); + } -- cgit v1.2.3