Add const specifier for not changed variables.

stone-payments · Apr 23, 2016 · a8e3da4 · a8e3da4
1 parent ce0bccb
commit a8e3da4
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 21 deletions.
diff --git a/ugui.c b/ugui.c
@@ -4552,8 +4552,6 @@ __UG_FONT_DATA unsigned char font_32x53[256][212]={
    const UG_FONT FONT_32X53 = {(unsigned char*)font_32x53,FONT_TYPE_1BPP,32,53,0,255,NULL};
 #endif
 
-
-
 UG_S16 UG_Init( UG_GUI* g, void (*p)(UG_S16,UG_S16,UG_COLOR), UG_S16 x, UG_S16 y )
 {
    UG_U8 i;
@@ -4936,7 +4934,7 @@ void UG_DrawLine( UG_S16 x1, UG_S16 y1, UG_S16 x2, UG_S16 y2, UG_COLOR c )
    }  
 }
 
-void UG_PutString( UG_S16 x, UG_S16 y, char* str )
+void UG_PutString( UG_S16 x, UG_S16 y, const char* str )
 {
    UG_S16 xp,yp;
    UG_U8 cw;
@@ -4973,7 +4971,7 @@ void UG_PutChar( char chr, UG_S16 x, UG_S16 y, UG_COLOR fc, UG_COLOR bc )
 	_UG_PutChar(chr,x,y,fc,bc,&gui->font);
 }
 
-void UG_ConsolePutString( char* str )
+void UG_ConsolePutString( const char* str )
 {
    char chr;
    UG_U8 cw;
@@ -5265,14 +5263,14 @@ void _UG_PutChar( char chr, UG_S16 x, UG_S16 y, UG_COLOR fc, UG_COLOR bc, const
 
    switch ( bt )
    {
-      case 0xF6: bt = 0x94; break; // �
-      case 0xD6: bt = 0x99; break; // �
-      case 0xFC: bt = 0x81; break; // �
-      case 0xDC: bt = 0x9A; break; // �
-      case 0xE4: bt = 0x84; break; // �
-      case 0xC4: bt = 0x8E; break; // �
-      case 0xB5: bt = 0xE6; break; // �
-      case 0xB0: bt = 0xF8; break; // �
+      case 0xF6: bt = 0x94; break; // �
+      case 0xD6: bt = 0x99; break; // �
+      case 0xFC: bt = 0x81; break; // �
+      case 0xDC: bt = 0x9A; break; // �
+      case 0xE4: bt = 0x84; break; // �
+      case 0xC4: bt = 0x8E; break; // �
+      case 0xB5: bt = 0xE6; break; // �
+      case 0xB0: bt = 0xF8; break; // �
    }
 
    if (bt < font->start_char || bt > font->end_char) return;
@@ -5323,9 +5321,9 @@ void _UG_PutChar( char chr, UG_S16 x, UG_S16 y, UG_COLOR fc, UG_COLOR bc, const
 			  for( i=0;i<actual_char_width;i++ )
 			  {
 				 b = font->p[index++];
-				 color = (((fc & 0xFF) * b + (bc & 0xFF) * (256 - b)) >> 8) & 0xFF |//Blue component
-				         (((fc & 0xFF00) * b + (bc & 0xFF00) * (256 - b)) >> 8)  & 0xFF00|//Green component
-				         (((fc & 0xFF0000) * b + (bc & 0xFF0000) * (256 - b)) >> 8) & 0xFF0000; //Red component
+				 color = ((((fc & 0xFF) * b + (bc & 0xFF) * (256 - b)) >> 8) & 0xFF) | //Blue component
+				         ((((fc & 0xFF00) * b + (bc & 0xFF00) * (256 - b)) >> 8)  & 0xFF00) | //Green component
+				         ((((fc & 0xFF0000) * b + (bc & 0xFF0000) * (256 - b)) >> 8) & 0xFF0000); //Red component
 				 push_pixel(color);
 			  }
 			  index += font->char_width - actual_char_width;
@@ -5372,9 +5370,9 @@ void _UG_PutChar( char chr, UG_S16 x, UG_S16 y, UG_COLOR fc, UG_COLOR bc, const
             for( i=0;i<actual_char_width;i++ )
             {
                b = font->p[index++];
-               color = (((fc & 0xFF) * b + (bc & 0xFF) * (256 - b)) >> 8) & 0xFF |//Blue component
-                       (((fc & 0xFF00) * b + (bc & 0xFF00) * (256 - b)) >> 8)  & 0xFF00|//Green component
-                       (((fc & 0xFF0000) * b + (bc & 0xFF0000) * (256 - b)) >> 8) & 0xFF0000; //Red component
+               color = ((((fc & 0xFF) * b + (bc & 0xFF) * (256 - b)) >> 8) & 0xFF) |//Blue component
+                       ((((fc & 0xFF00) * b + (bc & 0xFF00) * (256 - b)) >> 8)  & 0xFF00) |//Green component
+                       ((((fc & 0xFF0000) * b + (bc & 0xFF0000) * (256 - b)) >> 8) & 0xFF0000); //Red component
                gui->pset(xo,yo,color);
                xo++;
             }

diff --git a/ugui.h b/ugui.h
@@ -17,9 +17,15 @@
 #ifndef __UGUI_H
 #define __UGUI_H
 
-#include "system.h"
+#include <stdint.h>
 #include "ugui_config.h"
 
+typedef uint8_t      UG_U8;
+typedef int8_t       UG_S8;
+typedef uint16_t     UG_U16;
+typedef int16_t      UG_S16;
+typedef uint32_t     UG_U32;
+typedef int32_t      UG_S32;
 
 /* -------------------------------------------------------------------------------- */
 /* -- µGUI FONTS                                                                 -- */
@@ -895,9 +901,9 @@ void UG_DrawCircle( UG_S16 x0, UG_S16 y0, UG_S16 r, UG_COLOR c );
 void UG_FillCircle( UG_S16 x0, UG_S16 y0, UG_S16 r, UG_COLOR c );
 void UG_DrawArc( UG_S16 x0, UG_S16 y0, UG_S16 r, UG_U8 s, UG_COLOR c );
 void UG_DrawLine( UG_S16 x1, UG_S16 y1, UG_S16 x2, UG_S16 y2, UG_COLOR c );
-void UG_PutString( UG_S16 x, UG_S16 y, char* str );
+void UG_PutString( UG_S16 x, UG_S16 y, const char* str );
 void UG_PutChar( char chr, UG_S16 x, UG_S16 y, UG_COLOR fc, UG_COLOR bc );
-void UG_ConsolePutString( char* str );
+void UG_ConsolePutString( const char* str );
 void UG_ConsoleSetArea( UG_S16 xs, UG_S16 ys, UG_S16 xe, UG_S16 ye );
 void UG_ConsoleSetForecolor( UG_COLOR c );
 void UG_ConsoleSetBackcolor( UG_COLOR c );