Mercurial > hp34970-firmware / file diff

--- a/lib/unigraphic/GraphicsDisplay.h	Mon Oct 04 21:14:39 2021 +0200
+++ b/lib/unigraphic/GraphicsDisplay.h	Mon Oct 04 21:15:35 2021 +0200
@@ -42,9 +42,9 @@
 /** Bitmap
  */
 struct Bitmap_s{
-    int xSize;
-    int ySize;
-    int Byte_in_Line;
+    unsigned int xSize;
+    unsigned int ySize;
+    unsigned int Byte_in_Line;
     char* data;
     };
 
@@ -243,7 +243,7 @@
    *   cast the pointer to (unsigned char *) :
    *   tft.Bitmap(10,40,309,50,(unsigned char *)scala);
    */
-  void Bitmap(int x, int y, int w, int h,unsigned char *bitmap);
+  void Bitmap(unsigned int x, unsigned int y, unsigned int w, unsigned int h, unsigned char *bitmap);
 
     /** paint monochrome bitmap to screen
       *
@@ -349,22 +349,21 @@
 
 
 private:
-
     unsigned char* font;
     // display width and height related to current orientation
-    int oriented_width;
-    int oriented_height;
+    unsigned int oriented_width;
+    unsigned int oriented_height;
 
     // text char location
-    int char_x;
-    int char_y;
+    unsigned int char_x;
+    unsigned int char_y;
 
-    int  fontoffset;// bytes / char (short)
-    int  fonthor;   // hor size of font (char)
-    int  fontvert;  // ver size of font (char)
-    int fontbpl;   // bytes per line (char)
-    int fontzoomver; // size multiplier
-    int fontzoomhor; // size multiplier
+    unsigned int  fontoffset;// bytes / char (short)
+    unsigned int  fonthor;   // hor size of font (char)
+    unsigned int  fontvert;  // ver size of font (char)
+    unsigned int fontbpl;   // bytes per line (char)
+    unsigned int fontzoomver; // size multiplier
+    unsigned int fontzoomhor; // size multiplier
     unsigned char firstch;  // first ascii code present in font array (usually 32)
     unsigned char lastch;   // last ascii code present in font array (usually 127)
     bool auto_up;  // autoupdate flag for LCD