Merge remote branch 'origin/bug_530_add_dm800se_support'
authorghost <andreas.monzner@multimedia-labs.de>
Wed, 6 Oct 2010 09:55:09 +0000 (11:55 +0200)
committerghost <andreas.monzner@multimedia-labs.de>
Wed, 6 Oct 2010 09:55:09 +0000 (11:55 +0200)
1  2 
data/skin_default.xml
lib/dvb/dvb.cpp
lib/dvb/dvb.h
lib/gdi/font.cpp
lib/gdi/lcd.cpp

Simple merge
diff --cc lib/dvb/dvb.cpp
Simple merge
diff --cc lib/dvb/dvb.h
Simple merge
index 967c1df63b398373aae05e29c0511e469e96db73,6688a3d4075033d410a84c7ce0cf697b606bfa35..a5db43a9e3af99765f12ae4e91d933c5d38c1899
@@@ -839,9 -841,10 +869,10 @@@ void eTextPara::blit(gDC &dc, const ePo
                        } else
                        {
                                lookup8 = lookup8_invert;
+                               lookup16 = lookup16_invert;
                                lookup32 = lookup32_invert;
                        }
 -              
 +
                        static FTC_SBit glyph_bitmap;
                        if (fontRenderClass::instance->getGlyphBitmap(&i->font->font, i->glyph_index, &glyph_bitmap))
                                continue;
diff --cc lib/gdi/lcd.cpp
Simple merge