From 63fe996ebc3b721425d1a5978fb21c9c1b6f9255 Mon Sep 17 00:00:00 2001
From: bsongis <bsongis@gmail.com>
Date: Wed, 2 Jul 2014 15:27:38 +0200
Subject: [PATCH] Fixes #1427 - M badly displayed when SMLSIZE font used

---
 radio/src/lcd.cpp                             |   2 +-
 radio/src/tests/gtests.cpp                    |   9 +++++++++
 radio/src/tests/smlsize_putsstridx_212x64.png | Bin 0 -> 343 bytes
 3 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 radio/src/tests/smlsize_putsstridx_212x64.png

diff --git a/radio/src/lcd.cpp b/radio/src/lcd.cpp
index 4e742506d..8d0e9cb69 100644
--- a/radio/src/lcd.cpp
+++ b/radio/src/lcd.cpp
@@ -204,7 +204,7 @@ void lcd_putcAtt(xcoord_t x, uint8_t y, const unsigned char c, LcdFlags flags)
   }
   else if (flags & SMLSIZE) {
     q = (c < 0xc0 ? &font_4x6[(c-0x20)*5] : &font_4x6_extra[(c-0xc0)*5]);
-    lcdPutPattern(x, y, q, 4, 6, flags);
+    lcdPutPattern(x, y, q, 5, 6, flags);
   }
   else if (flags & TINSIZE) {
     q = &font_3x5[((uint16_t)c-0x2d)*3];
diff --git a/radio/src/tests/gtests.cpp b/radio/src/tests/gtests.cpp
index 7767eb849..ff89299b8 100644
--- a/radio/src/tests/gtests.cpp
+++ b/radio/src/tests/gtests.cpp
@@ -1069,6 +1069,15 @@ TEST(Lcd, Line_Wrap)
   EXPECT_TRUE(checkScreenshot("line_wrap"));
 }
 
+#if defined(CPUARM)
+TEST(Lcd, Smlsize_putsStrIdx)
+{
+  lcd_clear();
+  putsStrIdx(0, 0, "FM", 0, SMLSIZE);
+  EXPECT_TRUE(checkScreenshot("smlsize_putsstridx"));
+}
+#endif
+
 int main(int argc, char **argv)
 {
   QCoreApplication app(argc, argv);
diff --git a/radio/src/tests/smlsize_putsstridx_212x64.png b/radio/src/tests/smlsize_putsstridx_212x64.png
new file mode 100644
index 0000000000000000000000000000000000000000..6bca7494c97106c43352b029386c7b15663db240
GIT binary patch
literal 343
zcmeAS@N?(olHy`uVBq!ia0vp^SAf`og9%8!^*$#Bq?n7HJVQ7*IBq}me*oli7I;J!
zGca&>f-s}`$<u3rg1<an978JRyuD`Fb=W|_AyD<lykfJvCEU$7RU30<>Lz~IIvMux
zk@2<Uzni|#o4NP<&b`-+i}%GA%un7MQfgMtw*8;l3j4e-G1+I&Oubb#v;Ko(zS{lU
z>IJ*g|1#FBe|%r~`rq>wPvZDJ13%tYRkkyFq&!H7&&<7-H3g-9N9zGYfx*+&&t;uc
GLK6UGDSin6

literal 0
HcmV?d00001