summaryrefslogtreecommitdiff
path: root/glcddrivers/image.c
diff options
context:
space:
mode:
authormrwastl <mrwastl@users.sourceforge.net>2011-09-16 17:59:04 +0200
committermrwastl <mrwastl@users.sourceforge.net>2011-09-16 17:59:04 +0200
commit7178bcc48bc3377c4027e362ba217e9f3815cea5 (patch)
tree8f7cab76d7e5207128da9058b1d1e2d54f5e3a3a /glcddrivers/image.c
parent73ba3e0dd78c96a92e8297e62270bd4e5cd35a44 (diff)
downloadgraphlcd-base-7178bcc48bc3377c4027e362ba217e9f3815cea5.tar.gz
graphlcd-base-7178bcc48bc3377c4027e362ba217e9f3815cea5.tar.bz2
move config/oldConfig + it's initialisation to base class cDriver; libglcddrivers.so no longer link-dependent on libglcdgraphics.so
Diffstat (limited to 'glcddrivers/image.c')
-rw-r--r--glcddrivers/image.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/glcddrivers/image.c b/glcddrivers/image.c
index 6a67ddd..6a89ffa 100644
--- a/glcddrivers/image.c
+++ b/glcddrivers/image.c
@@ -25,15 +25,13 @@ namespace GLCD
{
cDriverImage::cDriverImage(cDriverConfig * config)
-: config(config)
+: cDriver(config)
{
- oldConfig = new cDriverConfig(*config);
}
cDriverImage::~cDriverImage()
{
DeInit();
- delete oldConfig;
}
int cDriverImage::Init()
@@ -146,7 +144,7 @@ void cDriverImage::SetPixel(int x, int y, uint32_t data)
pos = 7 - pos; // reverse bit position
}
- if (data == GLCD::cColor::White)
+ if (data == GRAPHLCD_White)
newLCD[y * x] |= ( 1 << pos );
else
newLCD[y * x] &= ( 0xFF ^ ( 1 << pos) );