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
@@ -411,11 +411,17 @@ i2500vfd_hbar(Driver *drvthis, int x, int y, int len, int promille, int pattern)
 }

 /////////////////////////////////////////////////////////////////
-// Reprogrammes character dest to contain an icon given by
-// which. Calls set_char() to do this.
+// Gets an icon character from the font definition and calls
+// chr() to draw it.
 //
 MODULE_EXPORT int
 i2500vfd_icon (Driver *drvthis, int x, int y, int icon)
 {
-    return (glcd_icon5x8(drvthis, x, y, icon));
+    int icon_char;
+
+    if ((icon_char = glcd_icon5x8(icon)) != -1) {
+        i2500vfd_chr(drvthis, x, y, icon_char);
+        return 0;
+    }
+    return -1;
 }