diff options
| author | mrwastl <mrwastl@users.sourceforge.net> | 2012-09-22 18:05:48 +0200 |
|---|---|---|
| committer | mrwastl <mrwastl@users.sourceforge.net> | 2012-09-22 18:05:48 +0200 |
| commit | bfcdb24a0e7f4cbcc439c31fd141e3ea90da0734 (patch) | |
| tree | 5d512b257b347c9e8f05591a3b6f20525bf9cd53 | |
| parent | 47dbc367354f6d8c97b8b54c78fb489d2438c6a0 (diff) | |
| download | graphlcd-base-bfcdb24a0e7f4cbcc439c31fd141e3ea90da0734.tar.gz graphlcd-base-bfcdb24a0e7f4cbcc439c31fd141e3ea90da0734.tar.bz2 | |
Revert "extformats: replace deprecated MaxRGB through QuantumRange (ImageMagick) and add a define for GraphicsMagick to accept QuantumRange"
This reverts commit 47dbc367354f6d8c97b8b54c78fb489d2438c6a0.
| -rw-r--r-- | glcdgraphics/extformats.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/glcdgraphics/extformats.c b/glcdgraphics/extformats.c index 4b3978d..f0bfc7f 100644 --- a/glcdgraphics/extformats.c +++ b/glcdgraphics/extformats.c @@ -26,10 +26,6 @@ //#elif defined(HAVE_IMLIB2) //#include "quantize.h" //#include <Imlib2.h> - /* ImageMagick threw away deprecated MaxRGB in a recent version (~ 6.7.0) but GraphicsMagick still doesn't have QuantumRange (1.3.x) */ - #ifndef QuantumRange - #define QuantumRange MaxRGB - #endif #endif @@ -138,11 +134,11 @@ bool cExtFormatFile::LoadScaled(cImage & image, const string & fileName, uint16_ for (int iy = 0; iy < (int)height; ++iy) { for (int ix = 0; ix < (int)width; ++ix) { - if ( isMatte && pix->opacity == QuantumRange ) { + if ( isMatte && pix->opacity == MaxRGB ) { 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)); - bmpdata[iy*width+ix] = (uint32_t)( (int(255 - (pix->opacity * 255 / QuantumRange)) << 24) | (int(pix->red * 255 / QuantumRange) << 16) | (int(pix->green * 255 / QuantumRange) << 8) | int(pix->blue * 255 / QuantumRange)); + bmpdata[iy*width+ix] = (uint32_t)( (int(255 - (pix->opacity * 255 / MaxRGB)) << 24) | (int(pix->red * 255 / MaxRGB) << 16) | (int(pix->green * 255 / MaxRGB) << 8) | int(pix->blue * 255 / MaxRGB)); //if ( isMonochrome ) { // if is monochrome: exchange black and white // uint32_t c = bmpdata[iy*width+ix]; // switch(c) { |