head 1.2; access; symbols pkgsrc-2026Q1:1.2.0.122 pkgsrc-2026Q1-base:1.2 pkgsrc-2025Q4:1.2.0.120 pkgsrc-2025Q4-base:1.2 pkgsrc-2025Q3:1.2.0.118 pkgsrc-2025Q3-base:1.2 pkgsrc-2025Q2:1.2.0.116 pkgsrc-2025Q2-base:1.2 pkgsrc-2025Q1:1.2.0.114 pkgsrc-2025Q1-base:1.2 pkgsrc-2024Q4:1.2.0.112 pkgsrc-2024Q4-base:1.2 pkgsrc-2024Q3:1.2.0.110 pkgsrc-2024Q3-base:1.2 pkgsrc-2024Q2:1.2.0.108 pkgsrc-2024Q2-base:1.2 pkgsrc-2024Q1:1.2.0.106 pkgsrc-2024Q1-base:1.2 pkgsrc-2023Q4:1.2.0.104 pkgsrc-2023Q4-base:1.2 pkgsrc-2023Q3:1.2.0.102 pkgsrc-2023Q3-base:1.2 pkgsrc-2023Q2:1.2.0.100 pkgsrc-2023Q2-base:1.2 pkgsrc-2023Q1:1.2.0.98 pkgsrc-2023Q1-base:1.2 pkgsrc-2022Q4:1.2.0.96 pkgsrc-2022Q4-base:1.2 pkgsrc-2022Q3:1.2.0.94 pkgsrc-2022Q3-base:1.2 pkgsrc-2022Q2:1.2.0.92 pkgsrc-2022Q2-base:1.2 pkgsrc-2022Q1:1.2.0.90 pkgsrc-2022Q1-base:1.2 pkgsrc-2021Q4:1.2.0.88 pkgsrc-2021Q4-base:1.2 pkgsrc-2021Q3:1.2.0.86 pkgsrc-2021Q3-base:1.2 pkgsrc-2021Q2:1.2.0.84 pkgsrc-2021Q2-base:1.2 pkgsrc-2021Q1:1.2.0.82 pkgsrc-2021Q1-base:1.2 pkgsrc-2020Q4:1.2.0.80 pkgsrc-2020Q4-base:1.2 pkgsrc-2020Q3:1.2.0.78 pkgsrc-2020Q3-base:1.2 pkgsrc-2020Q2:1.2.0.74 pkgsrc-2020Q2-base:1.2 pkgsrc-2020Q1:1.2.0.54 pkgsrc-2020Q1-base:1.2 pkgsrc-2019Q4:1.2.0.76 pkgsrc-2019Q4-base:1.2 pkgsrc-2019Q3:1.2.0.72 pkgsrc-2019Q3-base:1.2 pkgsrc-2019Q2:1.2.0.70 pkgsrc-2019Q2-base:1.2 pkgsrc-2019Q1:1.2.0.68 pkgsrc-2019Q1-base:1.2 pkgsrc-2018Q4:1.2.0.66 pkgsrc-2018Q4-base:1.2 pkgsrc-2018Q3:1.2.0.64 pkgsrc-2018Q3-base:1.2 pkgsrc-2018Q2:1.2.0.62 pkgsrc-2018Q2-base:1.2 pkgsrc-2018Q1:1.2.0.60 pkgsrc-2018Q1-base:1.2 pkgsrc-2017Q4:1.2.0.58 pkgsrc-2017Q4-base:1.2 pkgsrc-2017Q3:1.2.0.56 pkgsrc-2017Q3-base:1.2 pkgsrc-2017Q2:1.2.0.52 pkgsrc-2017Q2-base:1.2 pkgsrc-2017Q1:1.2.0.50 pkgsrc-2017Q1-base:1.2 pkgsrc-2016Q4:1.2.0.48 pkgsrc-2016Q4-base:1.2 pkgsrc-2016Q3:1.2.0.46 pkgsrc-2016Q3-base:1.2 pkgsrc-2016Q2:1.2.0.44 pkgsrc-2016Q2-base:1.2 pkgsrc-2016Q1:1.2.0.42 pkgsrc-2016Q1-base:1.2 pkgsrc-2015Q4:1.2.0.40 pkgsrc-2015Q4-base:1.2 pkgsrc-2015Q3:1.2.0.38 pkgsrc-2015Q3-base:1.2 pkgsrc-2015Q2:1.2.0.36 pkgsrc-2015Q2-base:1.2 pkgsrc-2015Q1:1.2.0.34 pkgsrc-2015Q1-base:1.2 pkgsrc-2014Q4:1.2.0.32 pkgsrc-2014Q4-base:1.2 pkgsrc-2014Q3:1.2.0.30 pkgsrc-2014Q3-base:1.2 pkgsrc-2014Q2:1.2.0.28 pkgsrc-2014Q2-base:1.2 pkgsrc-2014Q1:1.2.0.26 pkgsrc-2014Q1-base:1.2 pkgsrc-2013Q4:1.2.0.24 pkgsrc-2013Q4-base:1.2 pkgsrc-2013Q3:1.2.0.22 pkgsrc-2013Q3-base:1.2 pkgsrc-2013Q2:1.2.0.20 pkgsrc-2013Q2-base:1.2 pkgsrc-2013Q1:1.2.0.18 pkgsrc-2013Q1-base:1.2 pkgsrc-2012Q4:1.2.0.16 pkgsrc-2012Q4-base:1.2 pkgsrc-2012Q3:1.2.0.14 pkgsrc-2012Q3-base:1.2 pkgsrc-2012Q2:1.2.0.12 pkgsrc-2012Q2-base:1.2 pkgsrc-2012Q1:1.2.0.10 pkgsrc-2012Q1-base:1.2 pkgsrc-2011Q4:1.2.0.8 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q3:1.2.0.6 pkgsrc-2011Q3-base:1.2 pkgsrc-2011Q2:1.2.0.4 pkgsrc-2011Q2-base:1.2 pkgsrc-2011Q1:1.2.0.2 pkgsrc-2011Q1-base:1.2 pkgsrc-2010Q4:1.1.0.6 pkgsrc-2010Q4-base:1.1 pkgsrc-2010Q3:1.1.0.4 pkgsrc-2010Q3-base:1.1 pkgsrc-2010Q2:1.1.0.2 pkgsrc-2010Q2-base:1.1; locks; strict; comment @# @; 1.2 date 2011.02.01.10.27.39; author wiz; state Exp; branches; next 1.1; 1.1 date 2010.06.13.22.44.40; author wiz; state Exp; branches; next ; desc @@ 1.2 log @Fix build with png-1.5. @ text @$NetBSD: patch-ad,v 1.1 2010/06/13 22:44:40 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 @@@@ -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)) - 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); } @ 1.1 log @Bump PKGREVISION for libpng shlib name change. Also add some patches to remove use of deprecated symbols and fix other problems when looking for or compiling against libpng-1.4.x. @ text @d1 3 a3 1 $NetBSD$ d7 65 a71 1 @@@@ -270,8 +270,8 @@@@ namespace vigra { d74 1 a74 1 if (setjmp(png->jmpbuf)) d77 1 d83 144 @