Update for displayio.Glyph

Author: tannewt

adafruit_bitmap_font/bdf.py

@@ -1,4 +1,5 @@
 from .glyph_cache import GlyphCache
+from displayio import Glyph
 
 class BDF(GlyphCache):
     def __init__(self, f, bitmap_class):
@@ -29,16 +30,14 @@ def load_glyphs(self, code_points):
         metadata = True
         character = False
         code_point = None
-        rounded_x = 1
         bytes_per_row = 1
         desired_character = False
         current_info = None
         current_y = 0
+        rounded_x = 1
         total_remaining = len(code_points)
 
         x, _, _, _ = self.get_bounding_box()
-        # create a scratch bytearray to load pixels into
-        scratch_row = memoryview(bytearray((((x-1)//32)+1) * 4))
 
         self.file.seek(0)
         while True:
@@ -58,7 +57,16 @@ def load_glyphs(self, code_points):
             elif line.startswith(b"ENDCHAR"):
                 character = False
                 if desired_character:
-                    self._glyphs[code_point] = current_info
+                    bounds = current_info["bounds"]
+                    shift = current_info["shift"]
+                    self._glyphs[code_point] = Glyph(current_info["bitmap"],
+                                                     0,
+                                                     bounds[0],
+                                                     bounds[1],
+                                                     bounds[2],
+                                                     bounds[3],
+                                                     shift[0],
+                                                     shift[1])
                     if total_remaining == 0:
                         return
                 desired_character = False
@@ -99,10 +107,19 @@ def load_glyphs(self, code_points):
             elif character:
                 if desired_character:
                     bits = int(line.strip(), 16)
+                    width = current_info["bounds"][0]
+                    start = current_y * width
+                    x = 0
                     for i in range(rounded_x):
                         val = (bits >> ((rounded_x-i-1)*8)) & 0xFF
-                        scratch_row[i] = val
-                    current_info["bitmap"]._load_row(current_y, scratch_row[:bytes_per_row])
+                        for j in range(7,-1,-1):
+                            if x >= width:
+                                break
+                            bit = 0
+                            if val & (1 << j) != 0:
+                                bit = 1
+                            current_info["bitmap"][start + x] = bit
+                            x += 1
                     current_y += 1
             elif metadata:
                 #print(lineno, line.strip())