Merge pull request #56 from tekktrik/feature/ignore-comments-parsing

Ignore COMMENTS when parsing for FONTBOUNDINGBOX

Author: FoamyGuy

adafruit_bitmap_font/bdf.py

@@ -39,8 +39,7 @@ def __init__(self, f, bitmap_class):
         self.name = f
         self.file.seek(0)
         self.bitmap_class = bitmap_class
-        line = self.file.readline()
-        line = str(line, "utf-8")
+        line = self._readline_file()
         if not line or not line.startswith("STARTFONT 2.1"):
             raise ValueError("Unsupported file version")
         self._verify_bounding_box()
@@ -72,8 +71,7 @@ def ascent(self):
         if self._ascent is None:
             self.file.seek(0)
             while True:
-                line = self.file.readline()
-                line = str(line, "utf-8")
+                line = self._readline_file()
                 if not line:
                     break
 
@@ -93,8 +91,9 @@ def _verify_bounding_box(self):
         # Exception is when font file have a comment. Comments are three lines
         # 10 lines is a safe bet
         for _ in range(11):
-            line = self.file.readline()
-            line = str(line, "utf-8")
+            line = self._readline_file()
+            while line.startswith("COMMENT "):
+                line = self._readline_file()
             if line.startswith("FONTBOUNDINGBOX "):
                 _, x, y, x_offset, y_offset = line.split()
                 self._boundingbox = (int(x), int(y), int(x_offset), int(y_offset))
@@ -106,6 +105,10 @@ def _verify_bounding_box(self):
                 "Source file does not have the FOUNTBOUNDINGBOX parameter"
             ) from error
 
+    def _readline_file(self):
+        line = self.file.readline()
+        return str(line, "utf-8")
+
     def get_bounding_box(self):
         """Return the maximum glyph size as a 4-tuple of: width, height, x_offset, y_offset"""
         return self._boundingbox