diff options
| author | mrwastl <mrwastl@users.sourceforge.net> | 2011-05-01 22:22:32 +0200 |
|---|---|---|
| committer | mrwastl <mrwastl@users.sourceforge.net> | 2011-05-01 22:22:32 +0200 |
| commit | 46e597df44402086edd010b69702c2de52b75fc8 (patch) | |
| tree | fa9528f19f951b765b071c239b09547cf69bd169 /tools/convpic/tiff.c | |
| parent | 57729cf285b058d192a60bd7fce1b2d29bdd9650 (diff) | |
| download | graphlcd-base-46e597df44402086edd010b69702c2de52b75fc8.tar.gz graphlcd-base-46e597df44402086edd010b69702c2de52b75fc8.tar.bz2 | |
initial upload to branch 'touchcol'. see file 'HISTORY' for changes
Diffstat (limited to 'tools/convpic/tiff.c')
| -rw-r--r-- | tools/convpic/tiff.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/convpic/tiff.c b/tools/convpic/tiff.c index 4b8bf0e..3eb8cad 100644 --- a/tools/convpic/tiff.c +++ b/tools/convpic/tiff.c @@ -71,7 +71,8 @@ bool cTIFFFile::Load(GLCD::cImage & image, const std::string & fileName) unsigned char fLittleEndian=0; int j; int t; - unsigned char *bitmap = NULL; +// unsigned char *bitmap = NULL; + uint32_t *bitmap = NULL; bool bInvert = false; if (fileName.length() > 0) @@ -152,7 +153,8 @@ bool cTIFFFile::Load(GLCD::cImage & image, const std::string & fileName) image.SetWidth(width); image.SetHeight(height); image.SetDelay(100); - bitmap = new unsigned char[height * ((width + 7) / 8)]; +// bitmap = new unsigned char[height * ((width + 7) / 8)]; + bitmap = new uint32_t[height * width]; if (bitmap) { if (fread(bitmap, height*((width+7)/8), 1, fIN)!=1) |