Diff: lcd_base.cpp

Revision:

9:58b328831d0a

Parent:

8:7a4791dbb065

Child:

10:69571adcfad5

diff -r 7a4791dbb065 -r 58b328831d0a lcd_base.cpp
--- a/lcd_base.cpp	Thu Dec 06 02:18:22 2012 +0000
+++ b/lcd_base.cpp	Fri Dec 07 16:14:13 2012 +0000
@@ -31,13 +31,13 @@
 }
 
 inline
-void LCD::SetForeground( unsigned int color )
+void LCD::SetForeground( unsigned short color )
 {
     _foreground = color;
 }
 
 inline
-void LCD::SetBackground( unsigned int color )
+void LCD::SetBackground( unsigned short color )
 {
     _background = color;
 }
@@ -67,7 +67,7 @@
 
 void LCD::FillScreen( int color )
 {
-    unsigned int rgb = color == -1 ? _background : color == -2 ? _foreground : ( unsigned int ) color;
+    unsigned short rgb = color == -1 ? _background : color == -2 ? _foreground : ( unsigned short ) color;
     Activate();
     ClearXY();
     for ( int i = 0; i < ( ( _disp_width ) * ( _disp_height ) ); i++ )
@@ -120,7 +120,7 @@
     }
     else
     {
-        unsigned int usedColor = color == -1 ? _background : color == -2 ? _foreground : ( unsigned int ) color;
+        unsigned short usedColor = color == -1 ? _background : color == -2 ? _foreground : ( unsigned short ) color;
         Activate();
         if ( abs( x2 - x1 ) > abs( y2 - y1 ) )
         {
@@ -261,7 +261,7 @@
     int ddF_y = -2 * radius;
     int x1 = 0;
     int y1 = radius;
-    unsigned int usedColor = color == -1 ? _background : color == -2 ? _foreground : ( unsigned int ) color;
+    unsigned short usedColor = color == -1 ? _background : color == -2 ? _foreground : ( unsigned short ) color;
 
     Activate();
     SetXY( x, y + radius, x, y + radius );
@@ -306,7 +306,7 @@
 
 void LCD::FillCircle( unsigned short x, unsigned short y, unsigned short radius, int color )
 {
-    unsigned int usedColor = color == -1 ? _background : color == -2 ? _foreground : ( unsigned int ) color;
+    unsigned short usedColor = color == -1 ? _background : color == -2 ? _foreground : ( unsigned short ) color;
     Activate();
     for ( int y1 = -radius; y1 <= radius; y1++ )
         for ( int x1 = -radius; x1 <= radius; x1++ )
@@ -491,7 +491,7 @@
 
 void LCD::DrawHLine( unsigned short x, unsigned short y, unsigned short len, int color )
 {
-    unsigned int usedColor = color == -1 ? _background : color == -2 ? _foreground : ( unsigned int ) color;
+    unsigned short usedColor = color == -1 ? _background : color == -2 ? _foreground : ( unsigned short ) color;
     
     Activate();
     SetXY( x, y, x + len, y );
@@ -502,7 +502,7 @@
 
 void LCD::DrawVLine( unsigned short x, unsigned short y, unsigned short len, int color )
 {
-    unsigned int usedColor = color == -1 ? _background : color == -2 ? _foreground : ( unsigned int ) color;
+    unsigned short usedColor = color == -1 ? _background : color == -2 ? _foreground : ( unsigned short ) color;
     
     Activate();
     SetXY( x, y, x, y + len );
@@ -516,8 +516,8 @@
     uint8_t i, ch;
     uint16_t j;
     uint16_t temp;
-    unsigned int usedColorFG = fgColor == -1 ? _background : fgColor == -2 ? _foreground : ( unsigned int ) fgColor;
-    unsigned int usedColorBG = bgColor == -1 ? _background : bgColor == -2 ? _foreground : ( unsigned int ) bgColor;
+    unsigned short usedColorFG = fgColor == -1 ? _background : fgColor == -2 ? _foreground : ( unsigned short ) fgColor;
+    unsigned short usedColorBG = bgColor == -1 ? _background : bgColor == -2 ? _foreground : ( unsigned short ) bgColor;
 
     Activate();
 
@@ -571,8 +571,8 @@
     double radian;
     radian = deg * 0.0175;
     
-    unsigned int usedColorFG = fgColor == -1 ? _background : fgColor == -2 ? _foreground : ( unsigned int ) fgColor;
-    unsigned int usedColorBG = bgColor == -1 ? _background : bgColor == -2 ? _foreground : ( unsigned int ) bgColor;
+    unsigned short usedColorFG = fgColor == -1 ? _background : fgColor == -2 ? _foreground : ( unsigned short ) fgColor;
+    unsigned short usedColorBG = bgColor == -1 ? _background : bgColor == -2 ? _foreground : ( unsigned short ) bgColor;
 
     Activate();