1 --- src/vigra_impex/png.cxx
2 +++ src/vigra_impex/png.cxx
4 static void PngError( png_structp png_ptr, png_const_charp error_msg )
6 png_error_message = std::string(error_msg);
7 - longjmp( png_ptr->jmpbuf, 1 );
8 + longjmp( png_jmpbuf( png_ptr ), 1 );
11 // called on non-fatal errors
13 vigra_postcondition( png != 0, "could not create the read struct." );
16 - if (setjmp(png->jmpbuf)) {
17 + if (setjmp(png_jmpbuf( png ))) {
18 png_destroy_read_struct( &png, &info, NULL );
19 vigra_postcondition( false, png_error_message.insert(0, "error in png_create_info_struct(): ").c_str() );
22 vigra_postcondition( info != 0, "could not create the info struct." );
25 - if (setjmp(png->jmpbuf)) {
26 + if (setjmp(png_jmpbuf( png ))) {
27 png_destroy_read_struct( &png, &info, NULL );
28 vigra_postcondition( false, png_error_message.insert(0, "error in png_init_io(): ").c_str() );
30 png_init_io( png, file.get() );
32 // specify that the signature was already read
33 - if (setjmp(png->jmpbuf)) {
34 + if (setjmp(png_jmpbuf( png ))) {
35 png_destroy_read_struct( &png, &info, NULL );
36 vigra_postcondition( false, png_error_message.insert(0, "error in png_set_sig_bytes(): ").c_str() );
39 void PngDecoderImpl::init()
41 // read all chunks up to the image data
42 - if (setjmp(png->jmpbuf))
43 + if (setjmp(png_jmpbuf( png )))
44 vigra_postcondition( false, png_error_message.insert(0, "error in png_read_info(): ").c_str() );
45 png_read_info( png, info );
47 // pull over the header fields
48 int interlace_method, compression_method, filter_method;
49 - if (setjmp(png->jmpbuf))
50 + if (setjmp(png_jmpbuf( png )))
51 vigra_postcondition( false, png_error_message.insert(0, "error in png_get_IHDR(): ").c_str() );
52 png_get_IHDR( png, info, &width, &height, &bit_depth, &color_type,
53 &interlace_method, &compression_method, &filter_method );
56 // transform palette to rgb
57 if ( color_type == PNG_COLOR_TYPE_PALETTE) {
58 - if (setjmp(png->jmpbuf))
59 + if (setjmp(png_jmpbuf( png )))
60 vigra_postcondition( false, png_error_message.insert(0, "error in png_palette_to_rgb(): ").c_str() );
61 png_set_palette_to_rgb(png);
62 color_type = PNG_COLOR_TYPE_RGB;
65 // expand gray values to at least one byte size
66 if ( color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8 ) {
67 - if (setjmp(png->jmpbuf))
68 + if (setjmp(png_jmpbuf( png )))
69 vigra_postcondition( false,png_error_message.insert(0, "error in png_set_expand_gray_1_2_4_to_8(): ").c_str());
70 png_set_expand_gray_1_2_4_to_8(png);
74 // strip alpha channel
75 if ( color_type & PNG_COLOR_MASK_ALPHA ) {
76 - if (setjmp(png->jmpbuf))
77 + if (setjmp(png_jmpbuf( png )))
78 vigra_postcondition( false, png_error_message.insert(0, "error in png_set_strip_alpha(): ").c_str() );
79 png_set_strip_alpha(png);
80 color_type ^= PNG_COLOR_MASK_ALPHA;
84 #if (PNG_LIBPNG_VER > 10008) && defined(PNG_READ_iCCP_SUPPORTED)
86 + png_charpp dummyName;
89 + png_bytepp profilePtr;
90 png_uint_32 profileLen;
91 - if (info->valid & PNG_INFO_iCCP) {
92 - png_get_iCCP(png, info, &dummyName, &dummyCompType, &profilePtr, &profileLen) ;
93 + if (png_get_valid(png, info, PNG_INFO_iCCP)) {
94 + png_get_iCCP(png, info, dummyName, &dummyCompType, profilePtr, &profileLen) ;
95 iccProfilePtr = (unsigned char *) profilePtr;
96 iccProfileLength = profileLen;
100 double image_gamma = 0.45455;
101 if ( png_get_valid( png, info, PNG_INFO_gAMA ) ) {
102 - if (setjmp(png->jmpbuf))
103 + if (setjmp(png_jmpbuf( png )))
104 vigra_postcondition( false, png_error_message.insert(0, "error in png_get_gAMA(): ").c_str() );
105 png_get_gAMA( png, info, &image_gamma );
107 @@ -349,26 +349,26 @@
108 double screen_gamma = 2.2;
110 // set gamma correction
111 - if (setjmp(png->jmpbuf))
112 + if (setjmp(png_jmpbuf( png )))
113 vigra_postcondition( false, png_error_message.insert(0, "error in png_set_gamma(): ").c_str() );
114 png_set_gamma( png, screen_gamma, image_gamma );
117 // interlace handling, get number of read passes needed
118 - if (setjmp(png->jmpbuf))
119 + if (setjmp(png_jmpbuf( png )))
120 vigra_postcondition( false,png_error_message.insert(0, "error in png_set_interlace_handling(): ").c_str());
121 n_interlace_passes = png_set_interlace_handling(png);
123 // update png library state to reflect any changes that were made
124 - if (setjmp(png->jmpbuf))
125 + if (setjmp(png_jmpbuf( png )))
126 vigra_postcondition( false, png_error_message.insert(0, "error in png_read_update_info(): ").c_str() );
127 png_read_update_info( png, info );
129 - if (setjmp(png->jmpbuf))
130 + if (setjmp(png_jmpbuf( png )))
131 vigra_postcondition( false,png_error_message.insert(0, "error in png_get_channels(): ").c_str());
132 n_channels = png_get_channels(png, info);
134 - if (setjmp(png->jmpbuf))
135 + if (setjmp(png_jmpbuf( png )))
136 vigra_postcondition( false,png_error_message.insert(0, "error in png_get_rowbytes(): ").c_str());
137 rowsize = png_get_rowbytes(png, info);
140 void PngDecoderImpl::nextScanline()
142 for (int i=0; i < n_interlace_passes; i++) {
143 - if (setjmp(png->jmpbuf))
144 + if (setjmp(png_jmpbuf( png )))
145 vigra_postcondition( false,png_error_message.insert(0, "error in png_read_row(): ").c_str());
146 png_read_row(png, row_data.begin(), NULL);
149 vigra_postcondition( png != 0, "could not create the write struct." );
151 // create info struct
152 - if (setjmp(png->jmpbuf)) {
153 + if (setjmp(png_jmpbuf( png ))) {
154 png_destroy_write_struct( &png, &info );
155 vigra_postcondition( false, png_error_message.insert(0, "error in png_info_struct(): ").c_str() );
161 - if (setjmp(png->jmpbuf)) {
162 + if (setjmp(png_jmpbuf( png ))) {
163 png_destroy_write_struct( &png, &info );
164 vigra_postcondition( false, png_error_message.insert(0, "error in png_init_io(): ").c_str() );
167 void PngEncoderImpl::finalize()
170 - if (setjmp(png->jmpbuf))
171 + if (setjmp(png_jmpbuf( png )))
172 vigra_postcondition( false, png_error_message.insert(0, "error in png_set_IHDR(): ").c_str() );
173 png_set_IHDR( png, info, width, height, bit_depth, color_type,
174 PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT,
178 if (x_resolution > 0 && y_resolution > 0) {
179 - if (setjmp(png->jmpbuf))
180 + if (setjmp(png_jmpbuf( png )))
181 vigra_postcondition( false, png_error_message.insert(0, "error in png_set_pHYs(): ").c_str() );
182 png_set_pHYs(png, info, (png_uint_32) (x_resolution / 0.0254 + 0.5),
183 (png_uint_32) (y_resolution / 0.0254 + 0.5),
187 if (position.x > 0 && position.y > 0) {
188 - if (setjmp(png->jmpbuf))
189 + if (setjmp(png_jmpbuf( png )))
190 vigra_postcondition( false, png_error_message.insert(0, "error in png_set_oFFs(): ").c_str() );
191 png_set_oFFs(png, info, position.x, position.y, PNG_OFFSET_PIXEL);
193 @@ -597,12 +597,12 @@
195 if (iccProfile.size() > 0) {
196 png_set_iCCP(png, info, "icc", 0,
197 - (char *)iccProfile.begin(), iccProfile.size());
198 + iccProfile.begin(), iccProfile.size());
202 // write the info struct
203 - if (setjmp(png->jmpbuf))
204 + if (setjmp(png_jmpbuf( png )))
205 vigra_postcondition( false, png_error_message.insert(0, "error in png_write_info(): ").c_str() );
206 png_write_info( png, info );
208 @@ -634,10 +634,10 @@
211 // write the whole image
212 - if (setjmp(png->jmpbuf))
213 + if (setjmp(png_jmpbuf( png )))
214 vigra_postcondition( false, png_error_message.insert(0, "error in png_write_image(): ").c_str() );
215 png_write_image( png, row_pointers.begin() );
216 - if (setjmp(png->jmpbuf))
217 + if (setjmp(png_jmpbuf( png )))
218 vigra_postcondition( false, png_error_message.insert(0, "error in png_write_end(): ").c_str() );
219 png_write_end(png, info);