Make glcd_icon5x8() not calling back drvthis->chr() as this the call-back

function is not configurable and interferes with the Freetype renderer.
2011-11-03 21:58:17 +00:00
parent 0fdc92e156
commit b1e8fa9fb8
5 changed files with 57 additions and 31 deletions
@@ -448,9 +448,14 @@ t6963_hbar(Driver *drvthis, int x, int y, int len, int promille, int options)
 MODULE_EXPORT int
 t6963_icon(Driver *drvthis, int x, int y, int icon)
 {
+	int icon_char;
 	debug(RPT_DEBUG, "T6963: set icon %d", icon);

-	return (glcd_icon5x8(drvthis, x, y, icon));
+	if ((icon_char = glcd_icon5x8(icon)) != -1) {
+		t6963_chr(drvthis, x, y, icon_char);
+		return 0;
+	}
+	return -1;
 }

 /* EOF */