diff options
| author | mrwastl <mrwastl@users.sourceforge.net> | 2011-05-29 22:48:49 +0200 |
|---|---|---|
| committer | mrwastl <mrwastl@users.sourceforge.net> | 2011-05-29 22:48:49 +0200 |
| commit | c05fc9e328968a33723292fdb00ee56f0d3300ba (patch) | |
| tree | a8acc8811cb66bab3a600ddc43c2492996dbd411 | |
| parent | d95ac11c78ba8f86c06105f63036a95b6bb6d317 (diff) | |
| download | graphlcd-base-c05fc9e328968a33723292fdb00ee56f0d3300ba.tar.gz graphlcd-base-c05fc9e328968a33723292fdb00ee56f0d3300ba.tar.bz2 | |
disable transparency from images loaded by ImageMagick until a working solution has been found
| -rw-r--r-- | glcdgraphics/extformats.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/glcdgraphics/extformats.c b/glcdgraphics/extformats.c index 6a8de20..0cbcfa6 100644 --- a/glcdgraphics/extformats.c +++ b/glcdgraphics/extformats.c @@ -105,13 +105,15 @@ bool cExtFormatFile::Load(cImage & image, const string & fileName) //Dprintf("this image has %d colors\n", (*it).totalColors()); const PixelPacket *pix = (*it).getConstPixels(0, 0, (int)width, (int)height); + //uint8_t trans = 0; for (int iy = 0; iy < (int)height; ++iy) { for (int ix = 0; ix < (int)width; ++ix) { - if ( (int(pix->opacity * 255 / MaxRGB)) < 225 ) { // just an arbitrary border ... - bmpdata[iy*width+ix] = (uint32_t)((~int(pix->opacity * 255 / MaxRGB) << 24) | (int(pix->red * 255 / MaxRGB) << 16) | (int(pix->green * 255 / MaxRGB) << 8) | int(pix->blue * 255 / MaxRGB)); - } else { - bmpdata[iy*width+ix] = cColor::Transparent; - } + //trans = (uint8_t)(~int(pix->opacity * 255 / MaxRGB)); + //if ( trans == 0 ) { + // bmpdata[iy*width+ix] = cColor::Transparent; + //} else { + bmpdata[iy*width+ix] = (uint32_t)( 0xFF000000 | (int(pix->red * 255 / MaxRGB) << 16) | (int(pix->green * 255 / MaxRGB) << 8) | int(pix->blue * 255 / MaxRGB)); + //} ++pix; } } |