X-Git-Url: https://git.sesse.net/?p=ccbs;a=blobdiff_plain;f=bigscreen%2Ffonts.cpp;h=cedd03affddd01fa4c859d3642177ea88bd9d646;hp=8ceb87193b6cce7c9eae0dd228a56e4f698c9f39;hb=416d3d469d9ce4c15a860f61e24aee79da12402d;hpb=bcb73c11262a6de77c9af117390127797629478b

diff --git a/bigscreen/fonts.cpp b/bigscreen/fonts.cpp
index 8ceb871..cedd03a 100644
--- a/bigscreen/fonts.cpp
+++ b/bigscreen/fonts.cpp
@@ -61,7 +61,11 @@ unsigned my_draw_text(const widestring &str, unsigned char *buf, double size, in
 			if (glyph_index == 0)
 				continue;
 
+#if SCREEN_LCD
+			if (FT_Load_Glyph(*j, glyph_index, FT_LOAD_RENDER | FT_LOAD_TARGET_LCD))
+#else
 			if (FT_Load_Glyph(*j, glyph_index, FT_LOAD_RENDER))
+#endif
 				throw std::runtime_error("Couldn't load glyph");
 			slot = (*j)->glyph;
 			break;
@@ -80,19 +84,38 @@ unsigned my_draw_text(const widestring &str, unsigned char *buf, double size, in
 				if (dsty < 0 || dsty > signed(screen_height-1)) continue;
 
 				unsigned char *dst = buf + dsty * screen_width*4 + (x + xpos + slot->bitmap_left)*4;
-				unsigned char *src = bm->buffer + y * bm->width;
-
+#if SCREEN_LCD
+				unsigned char *src = bm->buffer + y * bm->pitch;
+				int width = (x + xpos + slot->bitmap_left + bm->width/3 >= signed(screen_width)) ? ((screen_width-1) - x - xpos - slot->bitmap_left) : bm->width/3;
+#else
+				unsigned char *src = bm->buffer + y * bm->pitch;
 				int width = (x + xpos + slot->bitmap_left + bm->width >= signed(screen_width)) ? ((screen_width-1) - x - xpos - slot->bitmap_left) : bm->width;
+#endif
+
+#if SCREEN_LCD
+				for (xx = 0; xx < width; xx++) {
+					*dst = (*dst * (256-src[2]) + b * src[2]) >> 8;
+					++dst;
+					*dst = (*dst * (256-src[1]) + g * src[1]) >> 8;
+					++dst;
+					*dst = (*dst * (256-src[0]) + r * src[0]) >> 8;
+					++dst;
+					*dst++ = 0;
+
+					src += 3;
+				}
+#else
 				for (xx = 0; xx < width; xx++) {
 					*dst = (*dst * (256-*src) + b * *src) >> 8;
-					*dst++;
+					++dst;
 					*dst = (*dst * (256-*src) + g * *src) >> 8;
-					*dst++;
+					++dst;
 					*dst = (*dst * (256-*src) + r * *src) >> 8;
-					*dst++;
+					++dst;
 					*dst++ = 0;
-					src++;
+					++src;
 				}
+#endif
 			}
 		}