i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libpng API changed, adapted PNGTranslator accordingly

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@35847 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Jérôme Duval
2010-03-13 18:38:33 +00:00
parent 6793fc9a17
commit 5291bbb0be
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/translators/png/PNGTranslator.cpp
+6 -6
View File
@@ -213,7 +213,7 @@ identify_png_header(BPositionIO *inSource, translator_info *outInfo)
uint8 buf[kSigSize]; uint8 buf[kSigSize];
if (inSource->Read(buf, kSigSize) != kSigSize) if (inSource->Read(buf, kSigSize) != kSigSize)
return B_NO_TRANSLATOR; return B_NO_TRANSLATOR;
if (!png_check_sig(buf, kSigSize)) if (png_sig_cmp(buf, 0, kSigSize))
// if first 8 bytes of stream don't match PNG signature bail // if first 8 bytes of stream don't match PNG signature bail
return B_NO_TRANSLATOR; return B_NO_TRANSLATOR;
@@ -322,7 +322,7 @@ PNGTranslator::translate_from_png_to_bits(BPositionIO *inSource,
png_uint_32 width, height; png_uint_32 width, height;
int bit_depth, color_type, interlace_type; int bit_depth, color_type, interlace_type;
png_get_IHDR(ppng, pinfo, &width, &height, &bit_depth, &color_type, png_get_IHDR(ppng, pinfo, &width, &height, &bit_depth, &color_type,
&interlace_type, int_p_NULL, int_p_NULL); &interlace_type, NULL, NULL);
// Setup image transformations to make converting it easier // Setup image transformations to make converting it easier
bool balpha = false; bool balpha = false;
@@ -338,7 +338,7 @@ PNGTranslator::translate_from_png_to_bits(BPositionIO *inSource,
if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8)
// In order to convert from low-depth gray images to RGB, // In order to convert from low-depth gray images to RGB,
// I first need to convert them to grayscale, 8 bpp // I first need to convert them to grayscale, 8 bpp
png_set_gray_1_2_4_to_8(ppng); png_set_expand_gray_1_2_4_to_8(ppng);
if (png_get_valid(ppng, pinfo, PNG_INFO_tRNS)) { if (png_get_valid(ppng, pinfo, PNG_INFO_tRNS)) {
// if there is transparency data in the // if there is transparency data in the
@@ -469,9 +469,9 @@ PNGTranslator::translate_from_png_to_bits(BPositionIO *inSource,
// free PNG handle / info structures // free PNG handle / info structures
if (!pinfo) if (!pinfo)
png_destroy_read_struct(&ppng, png_infopp_NULL, png_infopp_NULL); png_destroy_read_struct(&ppng, NULL, NULL);
else else
png_destroy_read_struct(&ppng, &pinfo, png_infopp_NULL); png_destroy_read_struct(&ppng, &pinfo, NULL);
} }
return result; return result;
@@ -907,7 +907,7 @@ PNGTranslator::translate_from_bits_to_png(BPositionIO *inSource,
// free PNG handle / info structures // free PNG handle / info structures
if (!pinfo) if (!pinfo)
png_destroy_write_struct(&ppng, png_infopp_NULL); png_destroy_write_struct(&ppng, NULL);
else else
png_destroy_write_struct(&ppng, &pinfo); png_destroy_write_struct(&ppng, &pinfo);
} }