Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 263345 Details for
Bug 355885
media-gfx/hugin-2010.4.0 fails with libpng-1.5
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
hugin-2010.4.0-libpng-1.5.patch
hugin-2010.4.0-libpng-1.5.patch (text/plain), 9.48 KB, created by
SpanKY
on 2011-02-21 18:12:26 UTC
(
hide
)
Description:
hugin-2010.4.0-libpng-1.5.patch
Filename:
MIME Type:
Creator:
SpanKY
Created:
2011-02-21 18:12:26 UTC
Size:
9.48 KB
patch
obsolete
>--- hugin-2010.4.0/src/foreign/vigra/vigra_impex/png.cxx >+++ hugin-2010.4.0/src/foreign/vigra/vigra_impex/png.cxx >@@ -78,7 +78,7 @@ > static void PngError( png_structp png_ptr, png_const_charp error_msg ) > { > png_error_message = std::string(error_msg); >- longjmp( png_ptr->jmpbuf, 1 ); >+ longjmp( png_jmpbuf(png_ptr), 1 ); > } > > // called on non-fatal errors >@@ -210,7 +210,7 @@ > 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() ); > } >@@ -218,14 +218,14 @@ > 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() ); > } >@@ -241,13 +241,13 @@ > 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 ); >@@ -261,7 +261,7 @@ > > // 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; >@@ -271,11 +271,11 @@ > // expand gray values to at least one byte size > if ( color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8 ) { > #if (PNG_LIBPNG_VER >= 10400) >- if (setjmp(png->jmpbuf)) >+ 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); > #else >- if (setjmp(png->jmpbuf)) >+ if (setjmp(png_jmpbuf(png))) > 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); > #endif >@@ -286,7 +286,7 @@ > #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; >@@ -326,12 +326,12 @@ > > // read icc profile > #if (PNG_LIBPNG_VER > 10008) && defined(PNG_READ_iCCP_SUPPORTED) >- char * dummyName; >+ png_charpp dummyName; > int dummyCompType; >- char * profilePtr; >+ png_bytepp profilePtr; > png_uint_32 profileLen; >- if (info->valid & PNG_INFO_iCCP) { >- png_get_iCCP(png, info, &dummyName, &dummyCompType, &profilePtr, &profileLen) ; >+ if (png_get_valid(png, info, PNG_INFO_iCCP)) { >+ png_get_iCCP(png, info, dummyName, &dummyCompType, profilePtr, &profileLen) ; > iccProfilePtr = (unsigned char *) profilePtr; > iccProfileLength = profileLen; > } >@@ -343,7 +343,7 @@ > // 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 ); > } >@@ -352,26 +352,26 @@ > 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); > >@@ -382,7 +382,7 @@ > 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); > } >@@ -548,7 +548,7 @@ > 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() ); > } >@@ -559,7 +559,7 @@ > } > > // 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() ); > } >@@ -574,7 +574,7 @@ > 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, >@@ -582,7 +582,7 @@ > > // 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), >@@ -591,7 +591,7 @@ > > // 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); > } >@@ -600,12 +600,12 @@ > // set icc profile > if (iccProfile.size() > 0) { > png_set_iCCP(png, info, "icc", 0, >- (char *)iccProfile.begin(), iccProfile.size()); >+ 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 ); > >@@ -637,10 +637,10 @@ > } > > // 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); > }
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 355885
: 263345