]>
Commit | Line | Data |
---|---|---|
e9c4b1a2 | 1 | ///////////////////////////////////////////////////////////////////////////// |
f172cb82 | 2 | // Name: src/common/imagpng.cpp |
e9c4b1a2 JS |
3 | // Purpose: wxImage PNG handler |
4 | // Author: Robert Roebling | |
5 | // RCS-ID: $Id$ | |
6 | // Copyright: (c) Robert Roebling | |
65571936 | 7 | // Licence: wxWindows licence |
e9c4b1a2 JS |
8 | ///////////////////////////////////////////////////////////////////////////// |
9 | ||
27bb2b7c VZ |
10 | // ============================================================================ |
11 | // declarations | |
12 | // ============================================================================ | |
13 | ||
27bb2b7c VZ |
14 | // ---------------------------------------------------------------------------- |
15 | // headers | |
16 | // ---------------------------------------------------------------------------- | |
17 | ||
e9c4b1a2 JS |
18 | // For compilers that support precompilation, includes "wx.h". |
19 | #include "wx/wxprec.h" | |
20 | ||
21 | #ifdef __BORLANDC__ | |
8898456d | 22 | #pragma hdrstop |
ce4169a4 RR |
23 | #endif |
24 | ||
8898456d WS |
25 | #if wxUSE_IMAGE && wxUSE_LIBPNG |
26 | ||
0bca0373 | 27 | #include "wx/imagpng.h" |
ccec9093 | 28 | #include "wx/versioninfo.h" |
0bca0373 | 29 | |
ce4169a4 | 30 | #ifndef WX_PRECOMP |
8898456d | 31 | #include "wx/log.h" |
c3b10b44 PC |
32 | #include "wx/intl.h" |
33 | #include "wx/palette.h" | |
34 | #include "wx/stream.h" | |
e9c4b1a2 JS |
35 | #endif |
36 | ||
a37e7424 | 37 | #include "png.h" |
e9c4b1a2 JS |
38 | |
39 | // For memcpy | |
40 | #include <string.h> | |
41 | ||
27bb2b7c VZ |
42 | // ---------------------------------------------------------------------------- |
43 | // constants | |
44 | // ---------------------------------------------------------------------------- | |
45 | ||
46 | // image can not have any transparent pixels at all, have only 100% opaque | |
47 | // and/or 100% transparent pixels in which case a simple mask is enough to | |
48 | // store this information in wxImage or have a real alpha channel in which case | |
49 | // we need to have it in wxImage as well | |
50 | enum Transparency | |
51 | { | |
52 | Transparency_None, | |
53 | Transparency_Mask, | |
54 | Transparency_Alpha | |
55 | }; | |
56 | ||
57 | // ---------------------------------------------------------------------------- | |
58 | // local functions | |
59 | // ---------------------------------------------------------------------------- | |
60 | ||
61 | // return the kind of transparency needed for this image assuming that it does | |
62 | // have transparent pixels, i.e. either Transparency_Alpha or Transparency_Mask | |
63 | static Transparency | |
36308e0e | 64 | CheckTransparency(unsigned char **lines, |
f7155274 VZ |
65 | png_uint_32 x, png_uint_32 y, png_uint_32 w, png_uint_32 h, |
66 | size_t numColBytes); | |
27bb2b7c VZ |
67 | |
68 | // init the alpha channel for the image and fill it with 1s up to (x, y) | |
69 | static unsigned char *InitAlpha(wxImage *image, png_uint_32 x, png_uint_32 y); | |
70 | ||
71 | // find a free colour for the mask in the PNG data array | |
72 | static void | |
73 | FindMaskColour(unsigned char **lines, png_uint_32 width, png_uint_32 height, | |
74 | unsigned char& rMask, unsigned char& gMask, unsigned char& bMask); | |
e9c4b1a2 | 75 | |
c9fcf581 VZ |
76 | // is the pixel with this value of alpha a fully opaque one? |
77 | static inline | |
78 | bool IsOpaque(unsigned char a) | |
79 | { | |
80 | return a == 0xff; | |
81 | } | |
82 | ||
83 | // is the pixel with this value of alpha a fully transparent one? | |
84 | static inline | |
85 | bool IsTransparent(unsigned char a) | |
86 | { | |
87 | return !a; | |
88 | } | |
89 | ||
27bb2b7c VZ |
90 | // ============================================================================ |
91 | // wxPNGHandler implementation | |
92 | // ============================================================================ | |
e9c4b1a2 | 93 | |
e9c4b1a2 | 94 | IMPLEMENT_DYNAMIC_CLASS(wxPNGHandler,wxImageHandler) |
e9c4b1a2 | 95 | |
e30285ab | 96 | #if wxUSE_STREAMS |
9ab6ee85 | 97 | |
0729bd19 | 98 | #ifndef PNGLINKAGEMODE |
c3b10b44 PC |
99 | #ifdef PNGAPI |
100 | #define PNGLINKAGEMODE PNGAPI | |
101 | #elif defined(__WATCOMC__) | |
30e0e251 VZ |
102 | // we need an explicit cdecl for Watcom, at least according to |
103 | // | |
104 | // http://sf.net/tracker/index.php?func=detail&aid=651492&group_id=9863&atid=109863 | |
105 | // | |
106 | // more testing is needed for this however, please remove this comment | |
107 | // if you can confirm that my fix works with Watcom 11 | |
108 | #define PNGLINKAGEMODE cdecl | |
109 | #else | |
110 | #define PNGLINKAGEMODE LINKAGEMODE | |
111 | #endif | |
717b9bf2 DW |
112 | #endif |
113 | ||
bdffd806 VS |
114 | |
115 | // VS: wxPNGInfoStruct declared below is a hack that needs some explanation. | |
27bb2b7c VZ |
116 | // First, let me describe what's the problem: libpng uses jmp_buf in |
117 | // its png_struct structure. Unfortunately, this structure is | |
118 | // compiler-specific and may vary in size, so if you use libpng compiled | |
bdffd806 | 119 | // as DLL with another compiler than the main executable, it may not work |
27bb2b7c | 120 | // (this is for example the case with wxMGL port and SciTech MGL library |
bdffd806 | 121 | // that provides custom runtime-loadable libpng implementation with jmpbuf |
27bb2b7c | 122 | // disabled altogether). Luckily, it is still possible to use setjmp() & |
bdffd806 VS |
123 | // longjmp() as long as the structure is not part of png_struct. |
124 | // | |
125 | // Sadly, there's no clean way to attach user-defined data to png_struct. | |
126 | // There is only one customizable place, png_struct.io_ptr, which is meant | |
27bb2b7c | 127 | // only for I/O routines and is set with png_set_read_fn or |
bdffd806 VS |
128 | // png_set_write_fn. The hacky part is that we use io_ptr to store |
129 | // a pointer to wxPNGInfoStruct that holds I/O structures _and_ jmp_buf. | |
130 | ||
131 | struct wxPNGInfoStruct | |
132 | { | |
133 | jmp_buf jmpbuf; | |
134 | bool verbose; | |
27bb2b7c | 135 | |
bdffd806 VS |
136 | union |
137 | { | |
138 | wxInputStream *in; | |
139 | wxOutputStream *out; | |
140 | } stream; | |
141 | }; | |
142 | ||
143 | #define WX_PNG_INFO(png_ptr) ((wxPNGInfoStruct*)png_get_io_ptr(png_ptr)) | |
144 | ||
27bb2b7c VZ |
145 | // ---------------------------------------------------------------------------- |
146 | // helper functions | |
147 | // ---------------------------------------------------------------------------- | |
bdffd806 | 148 | |
90350682 VZ |
149 | extern "C" |
150 | { | |
151 | ||
7d7b3f69 FM |
152 | static void PNGLINKAGEMODE wx_PNG_stream_reader( png_structp png_ptr, png_bytep data, |
153 | png_size_t length ) | |
e9c4b1a2 | 154 | { |
bdffd806 | 155 | WX_PNG_INFO(png_ptr)->stream.in->Read(data, length); |
e9c4b1a2 JS |
156 | } |
157 | ||
7d7b3f69 FM |
158 | static void PNGLINKAGEMODE wx_PNG_stream_writer( png_structp png_ptr, png_bytep data, |
159 | png_size_t length ) | |
e9c4b1a2 | 160 | { |
bdffd806 | 161 | WX_PNG_INFO(png_ptr)->stream.out->Write(data, length); |
e9c4b1a2 JS |
162 | } |
163 | ||
7d7b3f69 | 164 | static void |
bdffd806 | 165 | PNGLINKAGEMODE wx_png_warning(png_structp png_ptr, png_const_charp message) |
deb2fec0 | 166 | { |
d10c19d6 VZ |
167 | wxPNGInfoStruct *info = png_ptr ? WX_PNG_INFO(png_ptr) : NULL; |
168 | if ( !info || info->verbose ) | |
af588446 | 169 | { |
2b5f62a0 | 170 | wxLogWarning( wxString::FromAscii(message) ); |
af588446 | 171 | } |
deb2fec0 SB |
172 | } |
173 | ||
ce615190 DS |
174 | // from pngerror.c |
175 | // so that the libpng doesn't send anything on stderr | |
7d7b3f69 | 176 | static void |
0e0589e8 | 177 | PNGLINKAGEMODE wx_png_error(png_structp png_ptr, png_const_charp message) |
ce615190 | 178 | { |
ce615190 | 179 | wx_png_warning(NULL, message); |
0e0589e8 VZ |
180 | |
181 | // we're not using libpng built-in jump buffer (see comment before | |
182 | // wxPNGInfoStruct above) so we have to return ourselves, otherwise libpng | |
183 | // would just abort | |
184 | longjmp(WX_PNG_INFO(png_ptr)->jmpbuf, 1); | |
ce615190 DS |
185 | } |
186 | ||
90350682 VZ |
187 | } // extern "C" |
188 | ||
27bb2b7c VZ |
189 | // ---------------------------------------------------------------------------- |
190 | // LoadFile() helpers | |
191 | // ---------------------------------------------------------------------------- | |
192 | ||
d26d9754 | 193 | // determine the kind of transparency we need for this image: if the only alpha |
c9fcf581 VZ |
194 | // values it has are 0 (transparent) and 0xff (opaque) then we can simply |
195 | // create a mask for it, we should be ok with a simple mask but otherwise we | |
196 | // need a full blown alpha channel in wxImage | |
d26d9754 VZ |
197 | // |
198 | // parameters: | |
36308e0e | 199 | // lines raw PNG data |
d26d9754 VZ |
200 | // x, y starting position |
201 | // w, h size of the image | |
202 | // numColBytes number of colour bytes (1 for grey scale, 3 for RGB) | |
203 | // (NB: alpha always follows the colour bytes) | |
27bb2b7c | 204 | Transparency |
36308e0e | 205 | CheckTransparency(unsigned char **lines, |
d26d9754 VZ |
206 | png_uint_32 x, png_uint_32 y, png_uint_32 w, png_uint_32 h, |
207 | size_t numColBytes) | |
27bb2b7c | 208 | { |
d26d9754 VZ |
209 | // suppose that a mask will suffice and check all the remaining alpha |
210 | // values to see if it does | |
36308e0e | 211 | for ( ; y < h; y++ ) |
27bb2b7c | 212 | { |
e45cc235 RD |
213 | // each pixel is numColBytes+1 bytes, offset into the current line by |
214 | // the current x position | |
215 | unsigned const char *ptr = lines[y] + (x * (numColBytes + 1)); | |
36308e0e | 216 | |
c9fcf581 | 217 | for ( png_uint_32 x2 = x; x2 < w; x2++ ) |
27bb2b7c | 218 | { |
c9fcf581 | 219 | // skip the grey or colour byte(s) |
36308e0e | 220 | ptr += numColBytes; |
27bb2b7c | 221 | |
36308e0e | 222 | unsigned char a2 = *ptr++; |
c9fcf581 VZ |
223 | |
224 | if ( !IsTransparent(a2) && !IsOpaque(a2) ) | |
27bb2b7c | 225 | { |
d26d9754 VZ |
226 | // not fully opaque nor fully transparent, hence need alpha |
227 | return Transparency_Alpha; | |
27bb2b7c | 228 | } |
27bb2b7c | 229 | } |
c9fcf581 VZ |
230 | |
231 | // during the next loop iteration check all the pixels in the row | |
232 | x = 0; | |
27bb2b7c VZ |
233 | } |
234 | ||
d26d9754 VZ |
235 | // mask will be enough |
236 | return Transparency_Mask; | |
27bb2b7c VZ |
237 | } |
238 | ||
239 | unsigned char *InitAlpha(wxImage *image, png_uint_32 x, png_uint_32 y) | |
240 | { | |
241 | // create alpha channel | |
242 | image->SetAlpha(); | |
243 | ||
244 | unsigned char *alpha = image->GetAlpha(); | |
245 | ||
246 | // set alpha for the pixels we had so far | |
c9fcf581 VZ |
247 | png_uint_32 end = y * image->GetWidth() + x; |
248 | for ( png_uint_32 i = 0; i < end; i++ ) | |
27bb2b7c | 249 | { |
c9fcf581 VZ |
250 | // all the previous pixels were opaque |
251 | *alpha++ = 0xff; | |
27bb2b7c VZ |
252 | } |
253 | ||
254 | return alpha; | |
255 | } | |
256 | ||
257 | void | |
258 | FindMaskColour(unsigned char **lines, png_uint_32 width, png_uint_32 height, | |
259 | unsigned char& rMask, unsigned char& gMask, unsigned char& bMask) | |
260 | { | |
261 | // choosing the colour for the mask is more | |
262 | // difficult: we need to iterate over the entire | |
263 | // image for this in order to choose an unused | |
264 | // colour (this is not very efficient but what else | |
265 | // can we do?) | |
266 | wxImageHistogram h; | |
267 | unsigned nentries = 0; | |
268 | unsigned char r2, g2, b2; | |
269 | for ( png_uint_32 y2 = 0; y2 < height; y2++ ) | |
270 | { | |
271 | const unsigned char *p = lines[y2]; | |
272 | for ( png_uint_32 x2 = 0; x2 < width; x2++ ) | |
273 | { | |
274 | r2 = *p++; | |
275 | g2 = *p++; | |
276 | b2 = *p++; | |
dcc36b34 | 277 | ++p; // jump over alpha |
27bb2b7c VZ |
278 | |
279 | wxImageHistogramEntry& | |
280 | entry = h[wxImageHistogram:: MakeKey(r2, g2, b2)]; | |
281 | ||
282 | if ( entry.value++ == 0 ) | |
283 | entry.index = nentries++; | |
284 | } | |
285 | } | |
286 | ||
f773e9b0 | 287 | if ( !h.FindFirstUnusedColour(&rMask, &gMask, &bMask) ) |
27bb2b7c VZ |
288 | { |
289 | wxLogWarning(_("Too many colours in PNG, the image may be slightly blurred.")); | |
290 | ||
291 | // use a fixed mask colour and we'll fudge | |
292 | // the real pixels with this colour (see | |
293 | // below) | |
294 | rMask = 0xfe; | |
295 | gMask = 0; | |
296 | bMask = 0xff; | |
297 | } | |
298 | } | |
299 | ||
300 | // ---------------------------------------------------------------------------- | |
301 | // reading PNGs | |
302 | // ---------------------------------------------------------------------------- | |
303 | ||
304 | bool wxPNGHandler::DoCanRead( wxInputStream& stream ) | |
305 | { | |
306 | unsigned char hdr[4]; | |
307 | ||
8faef7cc | 308 | if ( !stream.Read(hdr, WXSIZEOF(hdr)) ) // it's ok to modify the stream position here |
7beb59f3 | 309 | return false; |
27bb2b7c VZ |
310 | |
311 | return memcmp(hdr, "\211PNG", WXSIZEOF(hdr)) == 0; | |
312 | } | |
313 | ||
314 | // convert data from RGB to wxImage format | |
315 | static | |
316 | void CopyDataFromPNG(wxImage *image, | |
317 | unsigned char **lines, | |
318 | png_uint_32 width, | |
319 | png_uint_32 height, | |
320 | int color_type) | |
321 | { | |
322 | Transparency transparency = Transparency_None; | |
323 | ||
324 | // only non NULL if transparency == Transparency_Alpha | |
325 | unsigned char *alpha = NULL; | |
326 | ||
327 | // RGB of the mask colour if transparency == Transparency_Mask | |
328 | // (but init them anyhow to avoid compiler warnings) | |
329 | unsigned char rMask = 0, | |
330 | gMask = 0, | |
331 | bMask = 0; | |
332 | ||
333 | unsigned char *ptrDst = image->GetData(); | |
334 | if ( !(color_type & PNG_COLOR_MASK_COLOR) ) | |
335 | { | |
336 | // grey image: GAGAGA... where G == grey component and A == alpha | |
337 | for ( png_uint_32 y = 0; y < height; y++ ) | |
338 | { | |
339 | const unsigned char *ptrSrc = lines[y]; | |
340 | for ( png_uint_32 x = 0; x < width; x++ ) | |
341 | { | |
342 | unsigned char g = *ptrSrc++; | |
343 | unsigned char a = *ptrSrc++; | |
344 | ||
345 | // the first time we encounter a transparent pixel we must | |
346 | // decide about what to do about them | |
c9fcf581 | 347 | if ( !IsOpaque(a) && transparency == Transparency_None ) |
27bb2b7c VZ |
348 | { |
349 | // we'll need at least the mask for this image and | |
350 | // maybe even full alpha channel info: the former is | |
351 | // only enough if we have alpha values of 0 and 0xff | |
352 | // only, otherwisewe need the latter | |
d26d9754 VZ |
353 | transparency = CheckTransparency |
354 | ( | |
36308e0e | 355 | lines, |
d26d9754 VZ |
356 | x, y, |
357 | width, height, | |
358 | 1 | |
359 | ); | |
27bb2b7c VZ |
360 | |
361 | if ( transparency == Transparency_Mask ) | |
362 | { | |
363 | // let's choose this colour for the mask: this is | |
364 | // not a problem here as all the other pixels are | |
365 | // grey, i.e. R == G == B which is not the case for | |
366 | // this one so no confusion is possible | |
367 | rMask = 0xff; | |
368 | gMask = 0; | |
369 | bMask = 0xff; | |
370 | } | |
371 | else // transparency == Transparency_Alpha | |
372 | { | |
373 | alpha = InitAlpha(image, x, y); | |
374 | } | |
375 | } | |
376 | ||
377 | switch ( transparency ) | |
378 | { | |
c9fcf581 VZ |
379 | case Transparency_Mask: |
380 | if ( IsTransparent(a) ) | |
381 | { | |
382 | *ptrDst++ = rMask; | |
c9fcf581 | 383 | *ptrDst++ = gMask; |
dcc36b34 | 384 | *ptrDst++ = bMask; |
c9fcf581 VZ |
385 | break; |
386 | } | |
387 | // else: !transparent | |
388 | ||
389 | // must be opaque then as otherwise we shouldn't be | |
390 | // using the mask at all | |
9a83f860 | 391 | wxASSERT_MSG( IsOpaque(a), wxT("logic error") ); |
c9fcf581 VZ |
392 | |
393 | // fall through | |
394 | ||
27bb2b7c | 395 | case Transparency_Alpha: |
c9fcf581 VZ |
396 | if ( alpha ) |
397 | *alpha++ = a; | |
27bb2b7c VZ |
398 | // fall through |
399 | ||
400 | case Transparency_None: | |
401 | *ptrDst++ = g; | |
402 | *ptrDst++ = g; | |
403 | *ptrDst++ = g; | |
404 | break; | |
27bb2b7c VZ |
405 | } |
406 | } | |
407 | } | |
408 | } | |
409 | else // colour image: RGBRGB... | |
410 | { | |
411 | for ( png_uint_32 y = 0; y < height; y++ ) | |
412 | { | |
413 | const unsigned char *ptrSrc = lines[y]; | |
414 | for ( png_uint_32 x = 0; x < width; x++ ) | |
415 | { | |
416 | unsigned char r = *ptrSrc++; | |
417 | unsigned char g = *ptrSrc++; | |
418 | unsigned char b = *ptrSrc++; | |
419 | unsigned char a = *ptrSrc++; | |
420 | ||
421 | // the logic here is the same as for the grey case except | |
422 | // where noted | |
c9fcf581 | 423 | if ( !IsOpaque(a) && transparency == Transparency_None ) |
27bb2b7c | 424 | { |
d26d9754 VZ |
425 | transparency = CheckTransparency |
426 | ( | |
36308e0e | 427 | lines, |
d26d9754 VZ |
428 | x, y, |
429 | width, height, | |
430 | 3 | |
431 | ); | |
27bb2b7c VZ |
432 | |
433 | if ( transparency == Transparency_Mask ) | |
434 | { | |
f773e9b0 RR |
435 | FindMaskColour(lines, width, height, |
436 | rMask, gMask, bMask); | |
27bb2b7c VZ |
437 | } |
438 | else // transparency == Transparency_Alpha | |
439 | { | |
440 | alpha = InitAlpha(image, x, y); | |
441 | } | |
442 | ||
443 | } | |
444 | ||
445 | switch ( transparency ) | |
446 | { | |
c9fcf581 VZ |
447 | case Transparency_Mask: |
448 | if ( IsTransparent(a) ) | |
449 | { | |
c9fcf581 | 450 | *ptrDst++ = rMask; |
c9fcf581 | 451 | *ptrDst++ = gMask; |
dcc36b34 | 452 | *ptrDst++ = bMask; |
c9fcf581 VZ |
453 | break; |
454 | } | |
999836aa VZ |
455 | else // !transparent |
456 | { | |
457 | // must be opaque then as otherwise we shouldn't be | |
458 | // using the mask at all | |
9a83f860 | 459 | wxASSERT_MSG( IsOpaque(a), wxT("logic error") ); |
999836aa VZ |
460 | |
461 | // if we couldn't find a unique colour for the | |
462 | // mask, we can have real pixels with the same | |
463 | // value as the mask and it's better to slightly | |
464 | // change their colour than to make them | |
465 | // transparent | |
466 | if ( r == rMask && g == gMask && b == bMask ) | |
467 | { | |
468 | r++; | |
469 | } | |
470 | } | |
c9fcf581 VZ |
471 | |
472 | // fall through | |
473 | ||
27bb2b7c | 474 | case Transparency_Alpha: |
c9fcf581 VZ |
475 | if ( alpha ) |
476 | *alpha++ = a; | |
27bb2b7c VZ |
477 | // fall through |
478 | ||
479 | case Transparency_None: | |
480 | *ptrDst++ = r; | |
481 | *ptrDst++ = g; | |
482 | *ptrDst++ = b; | |
483 | break; | |
27bb2b7c VZ |
484 | } |
485 | } | |
486 | } | |
487 | } | |
488 | ||
489 | if ( transparency == Transparency_Mask ) | |
490 | { | |
491 | image->SetMaskColour(rMask, gMask, bMask); | |
492 | } | |
493 | } | |
494 | ||
3ca6a5f0 BP |
495 | // temporarily disable the warning C4611 (interaction between '_setjmp' and |
496 | // C++ object destruction is non-portable) - I don't see any dtors here | |
497 | #ifdef __VISUALC__ | |
498 | #pragma warning(disable:4611) | |
499 | #endif /* VC++ */ | |
500 | ||
27bb2b7c VZ |
501 | bool |
502 | wxPNGHandler::LoadFile(wxImage *image, | |
503 | wxInputStream& stream, | |
504 | bool verbose, | |
505 | int WXUNUSED(index)) | |
e9c4b1a2 | 506 | { |
7884ab90 | 507 | // VZ: as this function uses setjmp() the only fool-proof error handling |
e9c4b1a2 | 508 | // method is to use goto (setjmp is not really C++ dtors friendly...) |
717b9bf2 | 509 | |
27bb2b7c VZ |
510 | unsigned char **lines = NULL; |
511 | png_infop info_ptr = (png_infop) NULL; | |
bdffd806 VS |
512 | wxPNGInfoStruct wxinfo; |
513 | ||
7884ab90 DS |
514 | png_uint_32 i, width, height = 0; |
515 | int bit_depth, color_type, interlace_type; | |
516 | ||
bdffd806 VS |
517 | wxinfo.verbose = verbose; |
518 | wxinfo.stream.in = &stream; | |
717b9bf2 | 519 | |
e9c4b1a2 | 520 | image->Destroy(); |
717b9bf2 | 521 | |
d10c19d6 VZ |
522 | png_structp png_ptr = png_create_read_struct |
523 | ( | |
524 | PNG_LIBPNG_VER_STRING, | |
525 | (voidp) NULL, | |
526 | wx_png_error, | |
527 | wx_png_warning | |
528 | ); | |
e9c4b1a2 | 529 | if (!png_ptr) |
27bb2b7c | 530 | goto error; |
717b9bf2 | 531 | |
bdffd806 VS |
532 | // NB: please see the comment near wxPNGInfoStruct declaration for |
533 | // explanation why this line is mandatory | |
e9b964cf | 534 | png_set_read_fn( png_ptr, &wxinfo, wx_PNG_stream_reader); |
deb2fec0 | 535 | |
e9c4b1a2 JS |
536 | info_ptr = png_create_info_struct( png_ptr ); |
537 | if (!info_ptr) | |
27bb2b7c | 538 | goto error; |
717b9bf2 | 539 | |
bdffd806 | 540 | if (setjmp(wxinfo.jmpbuf)) |
27bb2b7c | 541 | goto error; |
717b9bf2 | 542 | |
e9c4b1a2 | 543 | png_read_info( png_ptr, info_ptr ); |
d3b9f782 | 544 | png_get_IHDR( png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, &interlace_type, NULL, NULL ); |
717b9bf2 | 545 | |
e9c4b1a2 JS |
546 | if (color_type == PNG_COLOR_TYPE_PALETTE) |
547 | png_set_expand( png_ptr ); | |
717b9bf2 | 548 | |
2b5f62a0 VZ |
549 | // Fix for Bug [ 439207 ] Monochrome PNG images come up black |
550 | if (bit_depth < 8) | |
551 | png_set_expand( png_ptr ); | |
552 | ||
e9c4b1a2 JS |
553 | png_set_strip_16( png_ptr ); |
554 | png_set_packing( png_ptr ); | |
555 | if (png_get_valid( png_ptr, info_ptr, PNG_INFO_tRNS)) | |
556 | png_set_expand( png_ptr ); | |
557 | png_set_filler( png_ptr, 0xff, PNG_FILLER_AFTER ); | |
717b9bf2 | 558 | |
154e1ca1 | 559 | image->Create((int)width, (int)height, (bool) false /* no need to init pixels */); |
717b9bf2 | 560 | |
e9c4b1a2 | 561 | if (!image->Ok()) |
27bb2b7c | 562 | goto error; |
717b9bf2 | 563 | |
5550f66b VZ |
564 | // initialize all line pointers to NULL to ensure that they can be safely |
565 | // free()d if an error occurs before all of them could be allocated | |
566 | lines = (unsigned char **)calloc(height, sizeof(unsigned char *)); | |
27bb2b7c VZ |
567 | if ( !lines ) |
568 | goto error; | |
717b9bf2 | 569 | |
e9c4b1a2 JS |
570 | for (i = 0; i < height; i++) |
571 | { | |
479cd5de | 572 | if ((lines[i] = (unsigned char *)malloc( (size_t)(width * (sizeof(unsigned char) * 4)))) == NULL) |
e9c4b1a2 | 573 | goto error; |
e9c4b1a2 | 574 | } |
717b9bf2 | 575 | |
27bb2b7c VZ |
576 | png_read_image( png_ptr, lines ); |
577 | png_read_end( png_ptr, info_ptr ); | |
982a6623 RR |
578 | |
579 | #if wxUSE_PALETTE | |
580 | if (color_type == PNG_COLOR_TYPE_PALETTE) | |
581 | { | |
1de255d6 DS |
582 | png_colorp palette = NULL; |
583 | int numPalette = 0; | |
982a6623 | 584 | |
1de255d6 DS |
585 | (void) png_get_PLTE(png_ptr, info_ptr, &palette, &numPalette); |
586 | ||
587 | unsigned char* r = new unsigned char[numPalette]; | |
588 | unsigned char* g = new unsigned char[numPalette]; | |
589 | unsigned char* b = new unsigned char[numPalette]; | |
590 | ||
591 | for (int j = 0; j < numPalette; j++) | |
982a6623 | 592 | { |
1de255d6 DS |
593 | r[j] = palette[j].red; |
594 | g[j] = palette[j].green; | |
595 | b[j] = palette[j].blue; | |
982a6623 RR |
596 | } |
597 | ||
1de255d6 | 598 | image->SetPalette(wxPalette(numPalette, r, g, b)); |
982a6623 RR |
599 | delete[] r; |
600 | delete[] g; | |
601 | delete[] b; | |
602 | } | |
603 | #endif // wxUSE_PALETTE | |
604 | ||
27bb2b7c | 605 | png_destroy_read_struct( &png_ptr, &info_ptr, (png_infopp) NULL ); |
717b9bf2 | 606 | |
27bb2b7c VZ |
607 | // loaded successfully, now init wxImage with this data |
608 | CopyDataFromPNG(image, lines, width, height, color_type); | |
717b9bf2 | 609 | |
27bb2b7c VZ |
610 | for ( i = 0; i < height; i++ ) |
611 | free( lines[i] ); | |
612 | free( lines ); | |
717b9bf2 | 613 | |
7beb59f3 | 614 | return true; |
95ee0ac8 | 615 | |
27bb2b7c | 616 | error: |
58c837a4 | 617 | if (verbose) |
af588446 | 618 | { |
58c837a4 | 619 | wxLogError(_("Couldn't load a PNG image - file is corrupted or not enough memory.")); |
af588446 | 620 | } |
717b9bf2 | 621 | |
e9c4b1a2 JS |
622 | if ( image->Ok() ) |
623 | { | |
624 | image->Destroy(); | |
625 | } | |
717b9bf2 | 626 | |
e9c4b1a2 JS |
627 | if ( lines ) |
628 | { | |
0e0589e8 VZ |
629 | for ( unsigned int n = 0; n < height; n++ ) |
630 | free( lines[n] ); | |
631 | ||
e9c4b1a2 JS |
632 | free( lines ); |
633 | } | |
717b9bf2 | 634 | |
e9c4b1a2 JS |
635 | if ( png_ptr ) |
636 | { | |
637 | if ( info_ptr ) | |
638 | { | |
639 | png_destroy_read_struct( &png_ptr, &info_ptr, (png_infopp) NULL ); | |
640 | free(info_ptr); | |
641 | } | |
642 | else | |
643 | png_destroy_read_struct( &png_ptr, (png_infopp) NULL, (png_infopp) NULL ); | |
644 | } | |
7beb59f3 | 645 | return false; |
e9c4b1a2 JS |
646 | } |
647 | ||
8ee313d2 DS |
648 | // ---------------------------------------------------------------------------- |
649 | // SaveFile() helpers | |
650 | // ---------------------------------------------------------------------------- | |
651 | ||
652 | static int PaletteFind(const png_color& clr, | |
50fa616c | 653 | const png_color *pal, int palCount) |
8ee313d2 | 654 | { |
50fa616c | 655 | for (int i = 0; i < palCount; ++i) |
8ee313d2 DS |
656 | { |
657 | if ( (clr.red == pal[i].red) | |
658 | && (clr.green == pal[i].green) | |
659 | && (clr.blue == pal[i].blue)) | |
660 | { | |
661 | return i; | |
662 | } | |
663 | } | |
664 | ||
665 | return wxNOT_FOUND; | |
666 | } | |
667 | ||
27bb2b7c VZ |
668 | // ---------------------------------------------------------------------------- |
669 | // writing PNGs | |
670 | // ---------------------------------------------------------------------------- | |
671 | ||
deb2fec0 | 672 | bool wxPNGHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbose ) |
e9c4b1a2 | 673 | { |
bdffd806 | 674 | wxPNGInfoStruct wxinfo; |
717b9bf2 | 675 | |
bdffd806 VS |
676 | wxinfo.verbose = verbose; |
677 | wxinfo.stream.out = &stream; | |
deb2fec0 | 678 | |
d10c19d6 VZ |
679 | png_structp png_ptr = png_create_write_struct |
680 | ( | |
681 | PNG_LIBPNG_VER_STRING, | |
682 | NULL, | |
683 | wx_png_error, | |
684 | wx_png_warning | |
685 | ); | |
bdffd806 VS |
686 | if (!png_ptr) |
687 | { | |
688 | if (verbose) | |
af588446 | 689 | { |
bdffd806 | 690 | wxLogError(_("Couldn't save PNG image.")); |
af588446 | 691 | } |
7beb59f3 | 692 | return false; |
bdffd806 | 693 | } |
717b9bf2 | 694 | |
bdffd806 VS |
695 | png_infop info_ptr = png_create_info_struct(png_ptr); |
696 | if (info_ptr == NULL) | |
697 | { | |
698 | png_destroy_write_struct( &png_ptr, (png_infopp)NULL ); | |
699 | if (verbose) | |
af588446 | 700 | { |
bdffd806 | 701 | wxLogError(_("Couldn't save PNG image.")); |
af588446 | 702 | } |
7beb59f3 | 703 | return false; |
bdffd806 | 704 | } |
717b9bf2 | 705 | |
bdffd806 VS |
706 | if (setjmp(wxinfo.jmpbuf)) |
707 | { | |
708 | png_destroy_write_struct( &png_ptr, (png_infopp)NULL ); | |
709 | if (verbose) | |
af588446 | 710 | { |
bdffd806 | 711 | wxLogError(_("Couldn't save PNG image.")); |
af588446 | 712 | } |
7beb59f3 | 713 | return false; |
bdffd806 | 714 | } |
717b9bf2 | 715 | |
bdffd806 VS |
716 | // NB: please see the comment near wxPNGInfoStruct declaration for |
717 | // explanation why this line is mandatory | |
e9b964cf | 718 | png_set_write_fn( png_ptr, &wxinfo, wx_PNG_stream_writer, NULL); |
bdffd806 | 719 | |
8ee313d2 DS |
720 | const bool bHasPngFormatOption |
721 | = image->HasOption(wxIMAGE_OPTION_PNG_FORMAT); | |
722 | ||
723 | int iColorType = bHasPngFormatOption | |
a4efa721 VZ |
724 | ? image->GetOptionInt(wxIMAGE_OPTION_PNG_FORMAT) |
725 | : wxPNG_TYPE_COLOUR; | |
a4efa721 | 726 | |
a4efa721 VZ |
727 | bool bHasAlpha = image->HasAlpha(); |
728 | bool bHasMask = image->HasMask(); | |
8ee313d2 DS |
729 | |
730 | #if wxUSE_PALETTE | |
731 | /* | |
732 | Only save as an indexed image if the number of palette entries does not | |
733 | exceed libpng's limit (256). | |
734 | We assume here that we will need an extra palette entry if there's an | |
735 | alpha or mask, regardless of whether a possibly needed conversion from | |
736 | alpha to a mask fails (unlikely), or whether the mask colour already | |
737 | can be found in the palette (more likely). In the latter case an extra | |
738 | palette entry would not be required later on and the image could actually | |
739 | be saved as a palettised PNG (instead now it will be saved as true colour). | |
740 | A little bit of precision is lost, but at the benefit of a lot more | |
741 | simplified code. | |
742 | */ | |
743 | bool bUsePalette = | |
744 | (!bHasPngFormatOption || iColorType == wxPNG_TYPE_PALETTE) | |
745 | && image->HasPalette() | |
746 | && image->GetPalette().GetColoursCount() | |
747 | + ((bHasAlpha || bHasMask) ? 1 : 0) <= PNG_MAX_PALETTE_LENGTH; | |
748 | ||
749 | wxImage temp_image(*image); | |
750 | if (bUsePalette && image->HasAlpha() && !bHasMask) | |
751 | { | |
752 | /* | |
753 | Only convert alpha to mask if saving as a palettised image was | |
754 | explicitly requested. We don't want to lose alpha's precision | |
755 | by converting to a mask just to be able to save palettised. | |
756 | */ | |
757 | if (iColorType == wxPNG_TYPE_PALETTE | |
758 | && temp_image.ConvertAlphaToMask()) | |
759 | { | |
760 | image = &temp_image; | |
761 | bHasMask = true; | |
762 | bHasAlpha = image->HasAlpha(); | |
763 | } | |
764 | else | |
765 | { | |
766 | bUsePalette = false; | |
767 | iColorType = wxPNG_TYPE_COLOUR; | |
768 | } | |
769 | } | |
770 | #else | |
771 | bool bUsePalette = false; | |
772 | #endif // wxUSE_PALETTE | |
773 | ||
774 | bool bUseAlpha = !bUsePalette && (bHasAlpha || bHasMask); | |
775 | ||
776 | png_color mask; | |
777 | if (bHasMask) | |
778 | { | |
779 | mask.red = image->GetMaskRed(); | |
780 | mask.green = image->GetMaskGreen(); | |
781 | mask.blue = image->GetMaskBlue(); | |
782 | } | |
783 | ||
a4efa721 VZ |
784 | |
785 | int iPngColorType; | |
8ee313d2 DS |
786 | |
787 | #if wxUSE_PALETTE | |
788 | if (bUsePalette) | |
789 | { | |
790 | iPngColorType = PNG_COLOR_TYPE_PALETTE; | |
791 | iColorType = wxPNG_TYPE_PALETTE; | |
792 | } | |
793 | else | |
794 | #endif // wxUSE_PALETTE | |
a4efa721 VZ |
795 | if ( iColorType==wxPNG_TYPE_COLOUR ) |
796 | { | |
797 | iPngColorType = bUseAlpha ? PNG_COLOR_TYPE_RGB_ALPHA | |
798 | : PNG_COLOR_TYPE_RGB; | |
799 | } | |
800 | else | |
801 | { | |
802 | iPngColorType = bUseAlpha ? PNG_COLOR_TYPE_GRAY_ALPHA | |
803 | : PNG_COLOR_TYPE_GRAY; | |
804 | } | |
bdffd806 | 805 | |
d19ce8c4 FM |
806 | if (image->HasOption(wxIMAGE_OPTION_PNG_FILTER)) |
807 | png_set_filter( png_ptr, PNG_FILTER_TYPE_BASE, image->GetOptionInt(wxIMAGE_OPTION_PNG_FILTER) ); | |
808 | ||
809 | if (image->HasOption(wxIMAGE_OPTION_PNG_COMPRESSION_LEVEL)) | |
810 | png_set_compression_level( png_ptr, image->GetOptionInt(wxIMAGE_OPTION_PNG_COMPRESSION_LEVEL) ); | |
811 | ||
812 | if (image->HasOption(wxIMAGE_OPTION_PNG_COMPRESSION_MEM_LEVEL)) | |
813 | png_set_compression_mem_level( png_ptr, image->GetOptionInt(wxIMAGE_OPTION_PNG_COMPRESSION_MEM_LEVEL) ); | |
814 | ||
815 | if (image->HasOption(wxIMAGE_OPTION_PNG_COMPRESSION_STRATEGY)) | |
816 | png_set_compression_strategy( png_ptr, image->GetOptionInt(wxIMAGE_OPTION_PNG_COMPRESSION_STRATEGY) ); | |
817 | ||
818 | if (image->HasOption(wxIMAGE_OPTION_PNG_COMPRESSION_BUFFER_SIZE)) | |
819 | png_set_compression_buffer_size( png_ptr, image->GetOptionInt(wxIMAGE_OPTION_PNG_COMPRESSION_BUFFER_SIZE) ); | |
820 | ||
8ee313d2 DS |
821 | int iBitDepth = !bUsePalette && image->HasOption(wxIMAGE_OPTION_PNG_BITDEPTH) |
822 | ? image->GetOptionInt(wxIMAGE_OPTION_PNG_BITDEPTH) | |
823 | : 8; | |
824 | ||
a4efa721 VZ |
825 | png_set_IHDR( png_ptr, info_ptr, image->GetWidth(), image->GetHeight(), |
826 | iBitDepth, iPngColorType, | |
827 | PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_BASE, | |
828 | PNG_FILTER_TYPE_BASE); | |
829 | ||
8ee313d2 | 830 | #if wxUSE_PALETTE |
1de255d6 DS |
831 | png_colorp palette = NULL; |
832 | int numPalette = 0; | |
833 | ||
8ee313d2 DS |
834 | if (bUsePalette) |
835 | { | |
836 | const wxPalette& pal = image->GetPalette(); | |
837 | const int palCount = pal.GetColoursCount(); | |
1de255d6 | 838 | palette = (png_colorp) malloc( |
8ee313d2 DS |
839 | (palCount + 1 /*headroom for trans */) * sizeof(png_color)); |
840 | ||
841 | if (!palette) | |
842 | { | |
843 | png_destroy_write_struct( &png_ptr, (png_infopp)NULL ); | |
844 | if (verbose) | |
845 | { | |
846 | wxLogError(_("Couldn't save PNG image.")); | |
847 | } | |
848 | return false; | |
849 | } | |
850 | ||
50fa616c | 851 | for (int i = 0; i < palCount; ++i) |
8ee313d2 DS |
852 | { |
853 | pal.GetRGB(i, &palette[i].red, &palette[i].green, &palette[i].blue); | |
854 | } | |
855 | ||
1de255d6 | 856 | numPalette = palCount; |
8ee313d2 DS |
857 | if (bHasMask) |
858 | { | |
859 | int index = PaletteFind(mask, palette, numPalette); | |
860 | ||
861 | if (index) | |
862 | { | |
863 | if (index == wxNOT_FOUND) | |
864 | { | |
865 | numPalette++; | |
866 | index = palCount; | |
867 | palette[index] = mask; | |
868 | } | |
869 | ||
870 | wxSwap(palette[0], palette[index]); | |
871 | } | |
872 | ||
873 | png_byte trans = 0; | |
874 | png_set_tRNS(png_ptr, info_ptr, &trans, 1, NULL); | |
875 | } | |
876 | ||
877 | png_set_PLTE(png_ptr, info_ptr, palette, numPalette); | |
878 | free (palette); | |
1de255d6 DS |
879 | palette = NULL; |
880 | ||
881 | // Let palette point to libpng's copy of the palette. | |
882 | (void) png_get_PLTE(png_ptr, info_ptr, &palette, &numPalette); | |
8ee313d2 DS |
883 | } |
884 | #endif // wxUSE_PALETTE | |
885 | ||
a4efa721 | 886 | int iElements; |
bdffd806 | 887 | png_color_8 sig_bit; |
a4efa721 VZ |
888 | |
889 | if ( iPngColorType & PNG_COLOR_MASK_COLOR ) | |
890 | { | |
891 | sig_bit.red = | |
892 | sig_bit.green = | |
893 | sig_bit.blue = (png_byte)iBitDepth; | |
894 | iElements = 3; | |
895 | } | |
896 | else // grey | |
897 | { | |
898 | sig_bit.gray = (png_byte)iBitDepth; | |
899 | iElements = 1; | |
900 | } | |
901 | ||
902 | if ( iPngColorType & PNG_COLOR_MASK_ALPHA ) | |
903 | { | |
904 | sig_bit.alpha = (png_byte)iBitDepth; | |
905 | iElements++; | |
906 | } | |
907 | ||
dc683654 VZ |
908 | if ( iBitDepth == 16 ) |
909 | iElements *= 2; | |
910 | ||
361f4288 VZ |
911 | // save the image resolution if we have it |
912 | int resX, resY; | |
913 | switch ( GetResolutionFromOptions(*image, &resX, &resY) ) | |
914 | { | |
915 | case wxIMAGE_RESOLUTION_INCHES: | |
095cb950 PC |
916 | { |
917 | const double INCHES_IN_METER = 10000.0 / 254; | |
918 | resX = int(resX * INCHES_IN_METER); | |
919 | resY = int(resY * INCHES_IN_METER); | |
920 | } | |
361f4288 VZ |
921 | break; |
922 | ||
923 | case wxIMAGE_RESOLUTION_CM: | |
924 | resX *= 100; | |
925 | resY *= 100; | |
926 | break; | |
927 | ||
928 | case wxIMAGE_RESOLUTION_NONE: | |
929 | break; | |
930 | ||
931 | default: | |
9a83f860 | 932 | wxFAIL_MSG( wxT("unsupported image resolution units") ); |
361f4288 VZ |
933 | } |
934 | ||
935 | if ( resX && resY ) | |
936 | png_set_pHYs( png_ptr, info_ptr, resX, resY, PNG_RESOLUTION_METER ); | |
937 | ||
bdffd806 VS |
938 | png_set_sBIT( png_ptr, info_ptr, &sig_bit ); |
939 | png_write_info( png_ptr, info_ptr ); | |
940 | png_set_shift( png_ptr, &sig_bit ); | |
941 | png_set_packing( png_ptr ); | |
717b9bf2 | 942 | |
a4efa721 VZ |
943 | unsigned char * |
944 | data = (unsigned char *)malloc( image->GetWidth() * iElements ); | |
945 | if ( !data ) | |
bdffd806 VS |
946 | { |
947 | png_destroy_write_struct( &png_ptr, (png_infopp)NULL ); | |
7beb59f3 | 948 | return false; |
bdffd806 | 949 | } |
717b9bf2 | 950 | |
a4efa721 VZ |
951 | unsigned char * |
952 | pAlpha = (unsigned char *)(bHasAlpha ? image->GetAlpha() : NULL); | |
953 | int iHeight = image->GetHeight(); | |
954 | int iWidth = image->GetWidth(); | |
955 | ||
a4efa721 VZ |
956 | unsigned char *pColors = image->GetData(); |
957 | ||
958 | for (int y = 0; y != iHeight; ++y) | |
bdffd806 | 959 | { |
a4efa721 VZ |
960 | unsigned char *pData = data; |
961 | for (int x = 0; x != iWidth; x++) | |
e9c4b1a2 | 962 | { |
8ee313d2 DS |
963 | png_color clr; |
964 | clr.red = *pColors++; | |
965 | clr.green = *pColors++; | |
966 | clr.blue = *pColors++; | |
e1e36a3e | 967 | |
a4efa721 | 968 | switch ( iColorType ) |
bdffd806 | 969 | { |
a4efa721 | 970 | default: |
9a83f860 | 971 | wxFAIL_MSG( wxT("unknown wxPNG_TYPE_XXX") ); |
a4efa721 VZ |
972 | // fall through |
973 | ||
974 | case wxPNG_TYPE_COLOUR: | |
8ee313d2 | 975 | *pData++ = clr.red; |
dc683654 | 976 | if ( iBitDepth == 16 ) |
a4efa721 | 977 | *pData++ = 0; |
8ee313d2 | 978 | *pData++ = clr.green; |
dc683654 | 979 | if ( iBitDepth == 16 ) |
a4efa721 | 980 | *pData++ = 0; |
8ee313d2 | 981 | *pData++ = clr.blue; |
dc683654 | 982 | if ( iBitDepth == 16 ) |
a4efa721 VZ |
983 | *pData++ = 0; |
984 | break; | |
985 | ||
986 | case wxPNG_TYPE_GREY: | |
987 | { | |
dc683654 VZ |
988 | // where do these coefficients come from? maybe we |
989 | // should have image options for them as well? | |
a4efa721 | 990 | unsigned uiColor = |
8ee313d2 DS |
991 | (unsigned) (76.544*(unsigned)clr.red + |
992 | 150.272*(unsigned)clr.green + | |
993 | 36.864*(unsigned)clr.blue); | |
dc683654 VZ |
994 | |
995 | *pData++ = (unsigned char)((uiColor >> 8) & 0xFF); | |
996 | if ( iBitDepth == 16 ) | |
a4efa721 | 997 | *pData++ = (unsigned char)(uiColor & 0xFF); |
a4efa721 VZ |
998 | } |
999 | break; | |
1000 | ||
1001 | case wxPNG_TYPE_GREY_RED: | |
8ee313d2 | 1002 | *pData++ = clr.red; |
dc683654 | 1003 | if ( iBitDepth == 16 ) |
a4efa721 VZ |
1004 | *pData++ = 0; |
1005 | break; | |
8ee313d2 DS |
1006 | |
1007 | case wxPNG_TYPE_PALETTE: | |
1008 | *pData++ = (unsigned char) PaletteFind(clr, | |
1de255d6 | 1009 | palette, numPalette); |
8ee313d2 | 1010 | break; |
a4efa721 VZ |
1011 | } |
1012 | ||
1013 | if ( bUseAlpha ) | |
1014 | { | |
1015 | unsigned char uchAlpha = 255; | |
1016 | if ( bHasAlpha ) | |
1017 | uchAlpha = *pAlpha++; | |
1018 | ||
1019 | if ( bHasMask ) | |
e1e36a3e | 1020 | { |
8ee313d2 DS |
1021 | if ( (clr.red == mask.red) |
1022 | && (clr.green == mask.green) | |
1023 | && (clr.blue == mask.blue) ) | |
a4efa721 | 1024 | uchAlpha = 0; |
e1e36a3e | 1025 | } |
a4efa721 VZ |
1026 | |
1027 | *pData++ = uchAlpha; | |
dc683654 | 1028 | if ( iBitDepth == 16 ) |
a4efa721 | 1029 | *pData++ = 0; |
e9c4b1a2 | 1030 | } |
e9c4b1a2 | 1031 | } |
a4efa721 | 1032 | |
bdffd806 VS |
1033 | png_bytep row_ptr = data; |
1034 | png_write_rows( png_ptr, &row_ptr, 1 ); | |
e9c4b1a2 | 1035 | } |
bdffd806 VS |
1036 | |
1037 | free(data); | |
1038 | png_write_end( png_ptr, info_ptr ); | |
1039 | png_destroy_write_struct( &png_ptr, (png_infopp)&info_ptr ); | |
1040 | ||
7beb59f3 | 1041 | return true; |
e9c4b1a2 | 1042 | } |
e9c4b1a2 | 1043 | |
3ca6a5f0 BP |
1044 | #ifdef __VISUALC__ |
1045 | #pragma warning(default:4611) | |
1046 | #endif /* VC++ */ | |
1047 | ||
9ab6ee85 | 1048 | #endif // wxUSE_STREAMS |
e9c4b1a2 | 1049 | |
ccec9093 VZ |
1050 | /*static*/ wxVersionInfo wxPNGHandler::GetLibraryVersionInfo() |
1051 | { | |
1052 | // The version string seems to always have a leading space and a trailing | |
1053 | // new line, get rid of them both. | |
1054 | wxString str = png_get_header_version(NULL) + 1; | |
1055 | str.Replace("\n", ""); | |
1056 | ||
1057 | return wxVersionInfo("libpng", | |
1058 | PNG_LIBPNG_VER_MAJOR, | |
1059 | PNG_LIBPNG_VER_MINOR, | |
1060 | PNG_LIBPNG_VER_RELEASE, | |
1061 | str); | |
1062 | } | |
1063 | ||
9ab6ee85 | 1064 | #endif // wxUSE_LIBPNG |