Merge pull request #164 from LaurenzV/fixes

Fixes for RazrFalcon/rustybuzz#126

src/tables/glyf.rs

@@ -599,6 +599,25 @@ impl<'a> Table<'a> {
         outline_impl(self.loca_table, self.data, glyph_data, 0, &mut b)?
     }
 
+    /// The bounding box of the glyph. Unlike the `outline` method, this method does not
+    /// calculate the bounding box manually by outlining the glyph, but instead uses the
+    /// bounding box in the `glyf` program. As a result, this method will be much faster,
+    /// but the bounding box could be more inaccurate.
+    #[inline]
+    pub fn bbox(&self, glyph_id: GlyphId) -> Option<Rect> {
+        let glyph_data = self.get(glyph_id)?;
+
+        let mut s = Stream::new(glyph_data);
+        // number of contours
+        let _ = s.read::<i16>()?;
+        Some(Rect {
+            x_min: s.read::<i16>()?,
+            y_min: s.read::<i16>()?,
+            x_max: s.read::<i16>()?,
+            y_max: s.read::<i16>()?,
+        })
+    }
+
     #[inline]
     pub(crate) fn get(&self, glyph_id: GlyphId) -> Option<&'a [u8]> {
         let range = self.loca_table.glyph_range(glyph_id)?;

src/tables/gpos.rs

@@ -889,7 +889,7 @@ pub struct AnchorMatrix<'a> {
     pub rows: u16,
     /// Number of columns in the matrix.
     pub cols: u16,
-    matrix: LazyArray32<'a, Offset16>,
+    matrix: LazyArray32<'a, Option<Offset16>>,
 }
 
 impl<'a> AnchorMatrix<'a> {
@@ -909,7 +909,7 @@ impl<'a> AnchorMatrix<'a> {
     /// Returns an [`Anchor`] at position.
     pub fn get(&self, row: u16, col: u16) -> Option<Anchor> {
         let idx = u32::from(row) * u32::from(self.cols) + u32::from(col);
-        let offset = self.matrix.get(idx)?.to_usize();
+        let offset = self.matrix.get(idx)??.to_usize();
         Anchor::parse(self.data.get(offset..)?)
     }
 }