From 4ffc94b88d7c6cba355e89240d469f0f8f46a7f1 Mon Sep 17 00:00:00 2001
From: Raphael Coeffic <raphael.coeffic@frafos.com>
Date: Thu, 26 May 2022 06:44:14 +0200
Subject: [PATCH] 8bit masks use uint16_t for width/height

---
 radio/src/thirdparty/libopenui/src/bitmapbuffer.cpp   | 5 +++--
 radio/src/thirdparty/libopenui/tools/encode-bitmap.py | 1 -
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/radio/src/thirdparty/libopenui/src/bitmapbuffer.cpp b/radio/src/thirdparty/libopenui/src/bitmapbuffer.cpp
index 913104421..cafa1d0d9 100644
--- a/radio/src/thirdparty/libopenui/src/bitmapbuffer.cpp
+++ b/radio/src/thirdparty/libopenui/src/bitmapbuffer.cpp
@@ -1268,10 +1268,11 @@ BitmapBuffer * BitmapBuffer::loadMask(const char * filename)
 
 BitmapBuffer* BitmapBuffer::load8bitMask(const uint8_t * lbm)
 {
-  BitmapBuffer * bitmap = new BitmapBuffer(BMP_RGB565,lbm[0],lbm[1]);
+  const uint16_t* hdr = (const uint16_t*)lbm;
+  BitmapBuffer * bitmap = new BitmapBuffer(BMP_RGB565,hdr[0],hdr[1]);
   if (bitmap) {
     pixel_t * p = bitmap->getPixelPtrAbs(0, 0);
-    const uint8_t * src = lbm + 2;
+    const uint8_t * src = lbm + 4;
     for (int i = bitmap->width() * bitmap->height(); i > 0; i--) {
       *((uint8_t *)p) = (*(src++) >> 4);
       MOVE_TO_NEXT_RIGHT_PIXEL(p);
diff --git a/radio/src/thirdparty/libopenui/tools/encode-bitmap.py b/radio/src/thirdparty/libopenui/tools/encode-bitmap.py
index c99167297..bd2c7be90 100755
--- a/radio/src/thirdparty/libopenui/tools/encode-bitmap.py
+++ b/radio/src/thirdparty/libopenui/tools/encode-bitmap.py
@@ -134,7 +134,6 @@ class ImageEncoder:
                 value = self.get_pixel(image, x, y)
                 value = 0xFF - value
                 self.encode_byte(value)
-            self.f.write("\n")
         self.encode_end()
 
     def encode_5_6_5(self, image):