From e26a4742233117c86c5bd271871ca8c3764be94b Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Tue, 19 Mar 2019 16:20:17 -0700 Subject: [PATCH] Add support for fontio --- adafruit_bitmap_font/bdf.py | 5 ++++- test/displayio.py | 3 --- test/fontio.py | 3 +++ 3 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 test/fontio.py diff --git a/adafruit_bitmap_font/bdf.py b/adafruit_bitmap_font/bdf.py index 700aaa7..fea1470 100644 --- a/adafruit_bitmap_font/bdf.py +++ b/adafruit_bitmap_font/bdf.py @@ -40,7 +40,10 @@ """ import gc -from displayio import Glyph +try: + from displayio import Glyph +except ImportError: + from fontio import Glyph from .glyph_cache import GlyphCache __version__ = "0.0.0-auto.0" diff --git a/test/displayio.py b/test/displayio.py index f0ed8d9..ae416b3 100644 --- a/test/displayio.py +++ b/test/displayio.py @@ -1,4 +1,3 @@ -import collections class Bitmap: def __init__(self, width, height, color_count): @@ -20,5 +19,3 @@ def __getitem__(self, index): def __len__(self): return self.width * self.height - -Glyph = collections.namedtuple("Glyph", ["bitmap", "tile_index", "width", "height", "dx", "dy", "shift_x", "shift_y"]) diff --git a/test/fontio.py b/test/fontio.py new file mode 100644 index 0000000..3aaa513 --- /dev/null +++ b/test/fontio.py @@ -0,0 +1,3 @@ +import collections + +Glyph = collections.namedtuple("Glyph", ["bitmap", "tile_index", "width", "height", "dx", "dy", "shift_x", "shift_y"])