diff options
| author | mrwastl <mrwastl@users.sourceforge.net> | 2012-06-07 16:47:13 +0200 |
|---|---|---|
| committer | mrwastl <mrwastl@users.sourceforge.net> | 2012-06-07 16:47:13 +0200 |
| commit | dbd4bd72007e382bea3a123cc2d86fefd962cf37 (patch) | |
| tree | fd5b5cc48fce459732eececb103e9a84f1f2ee92 /glcdgraphics/bitmap.c | |
| parent | a39f265732d0bc28cb66b58b5ecf1964a130d02b (diff) | |
| download | graphlcd-base-dbd4bd72007e382bea3a123cc2d86fefd962cf37.tar.gz graphlcd-base-dbd4bd72007e382bea3a123cc2d86fefd962cf37.tar.bz2 | |
Image/GraphicsMagick: use much more relieable sample() instead of scale() for scaling images; monochrome images: fix monochrome bug in imagefile.c; explicitly prepend namespace Magick:: instead of using 'using namespace Magick;' (easier when debugging); some code / var-names beautifyings
Diffstat (limited to 'glcdgraphics/bitmap.c')
| -rw-r--r-- | glcdgraphics/bitmap.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/glcdgraphics/bitmap.c b/glcdgraphics/bitmap.c index b96fe6d..d6f0d11 100644 --- a/glcdgraphics/bitmap.c +++ b/glcdgraphics/bitmap.c @@ -10,7 +10,7 @@ * to the COPYING file distributed with this package. * * (c) 2004-2010 Andreas Regel <andreas.regel AT powarman.de> - * (c) 2010-2011 Wolfgang Astleitner <mrwastl AT users sourceforge net> + * (c) 2010-2012 Wolfgang Astleitner <mrwastl AT users sourceforge net> * Andreas 'randy' Weinberger */ @@ -570,7 +570,7 @@ void cBitmap::DrawBitmap(int x, int y, const cBitmap & bitmap, uint32_t color, u uint32_t cl = 0; const uint32_t * data = bitmap.Data(); - bool ismonochrome = bitmap.IsMonochrome(); + bool ismono = bitmap.IsMonochrome(); int xt, yt; uint32_t alpha; @@ -583,7 +583,7 @@ void cBitmap::DrawBitmap(int x, int y, const cBitmap & bitmap, uint32_t color, u { cl = data[(yt * bitmap.Width())+xt]; if (cl != cColor::Transparent) { - if (ismonochrome) { + if (ismono) { cl = (cl == cColor::Black) ? color : bgcolor; } if (opacity != 255) { |