From 7fce34e18d9cf800aa5756408c8f9deffccc74bc Mon Sep 17 00:00:00 2001 From: bernie Date: Tue, 17 Jan 2006 02:30:43 +0000 Subject: [PATCH] Fix QImage format. git-svn-id: https://src.develer.com/svnoss/bertos/trunk@472 38d2e660-2303-0410-9eaa-f027e97ec537 --- drv/lcd_gfx_qt.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/drv/lcd_gfx_qt.cpp b/drv/lcd_gfx_qt.cpp index 4a3a4863..e4582a35 100755 --- a/drv/lcd_gfx_qt.cpp +++ b/drv/lcd_gfx_qt.cpp @@ -14,6 +14,9 @@ /*#* *#* $Log$ + *#* Revision 1.2 2006/01/17 02:30:43 bernie + *#* Fix QImage format. + *#* *#* Revision 1.1 2006/01/16 03:51:35 bernie *#* Add LCD Qt emulator. *#* @@ -21,6 +24,7 @@ #include "lcd_gfx_qt.h" #include +#include #include #include @@ -68,7 +72,7 @@ QSize EmulLCD::sizeHint() const void EmulLCD::drawContents(QPainter *p) { - QImage img(raster, WIDTH, HEIGHT, 1, NULL, 0, QImage::IgnoreEndian); + QImage img(raster, WIDTH, HEIGHT, 1, NULL, 0, QImage::BigEndian); p->setBackgroundMode(OpaqueMode); p->setPen(fg_color); @@ -95,7 +99,7 @@ void EmulLCD::writeRaster(uint8_t *new_raster) * as required by the LCD driver. */ DECLARE_WALL(wall_before_raster, WALL_SIZE) -static uint8_t lcd_raster[EmulLCD::WIDTH * ((EmulLCD::HEIGHT + 7) / 8)]; +static uint8_t lcd_raster[(EmulLCD::WIDTH + 7 / 8) * EmulLCD::HEIGHT]; DECLARE_WALL(wall_after_raster, WALL_SIZE) /*! Default LCD bitmap */ @@ -103,12 +107,16 @@ struct Bitmap lcd_bitmap; extern "C" void lcd_init(void) { + //INIT_WALL(wall_before_raster); + //INIT_WALL(wall_after_raster); gfx_bitmapInit(&lcd_bitmap, lcd_raster, EmulLCD::WIDTH, EmulLCD::HEIGHT); gfx_bitmapClear(&lcd_bitmap); } extern "C" void lcd_blit_bitmap(Bitmap *bm) { + //CHECK_WALL(wall_before_raster); + //CHECK_WALL(wall_after_raster); emul->emulLCD->writeRaster(bm->raster); } -- 2.25.1