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

Fixed low-depth grayscale issue, PNGTranslator can now read grayscale PNG images that are less than 8 bpp

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@7324 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Matthew Wilber
2004-04-26 23:09:19 +00:00
parent 1b56ef303a
commit 7fb3685ba6
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/translators/pngtranslator/PNGTranslator.cpp
+5 -8
View File
@@ -322,14 +322,6 @@ PNGTranslator::translate_from_png_to_bits(BPositionIO *inSource,
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, int_p_NULL, int_p_NULL);
if ((color_type == PNG_COLOR_TYPE_GRAY ||
color_type == PNG_COLOR_TYPE_GRAY_ALPHA) && bit_depth < 8) {
// libpng's gray to RGB conversion is not implemented
// for bit depths less than 8
result = B_NO_TRANSLATOR;
break;
}
// Setup image transformations to make converting it easier // Setup image transformations to make converting it easier
bool balpha = false; bool balpha = false;
@@ -342,6 +334,11 @@ PNGTranslator::translate_from_png_to_bits(BPositionIO *inSource,
if (color_type == PNG_COLOR_TYPE_PALETTE) if (color_type == PNG_COLOR_TYPE_PALETTE)
png_set_palette_to_rgb(ppng); png_set_palette_to_rgb(ppng);
if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8)
// In order to convert from low-depth gray images to RGB,
// I first need to convert them to grayscale, 8 bpp
png_set_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
// PNG, but not in the form of an alpha channel // PNG, but not in the form of an alpha channel