fix conflicts

googlefonts · Aug 24, 2023 · 2ce614f · 2ce614f
1 parent b80de78
commit 2ce614f
Showing 1 changed file with 0 additions and 46 deletions.
diff --git a/read-fonts/src/tables/glyf.rs b/read-fonts/src/tables/glyf.rs
@@ -1008,52 +1008,6 @@ mod tests {
         );
     }
 
-    #[test]
-    fn simple_glyph_overlapping_contour_flag() {
-        let font = FontRef::new(font_test_data::VAZIRMATN_VAR).unwrap();
-        let loca = font.loca(None).unwrap();
-        let glyf = font.glyf().unwrap();
-        let glyph_count = font.maxp().unwrap().num_glyphs();
-        for gid in 0..glyph_count {
-            let glyph = match loca.get_glyf(GlyphId::new(gid), &glyf) {
-                Ok(Some(Glyph::Simple(glyph))) => glyph,
-                _ => continue,
-            };
-            if gid == 3 {
-                // Only GID 3 has the overlap bit set
-                assert!(glyph.has_overlapping_contours())
-            } else {
-                assert!(!glyph.has_overlapping_contours())
-            }
-        }
-    }
-
-    #[test]
-    fn composite_overlapping_contour_flag() {
-        let font = FontRef::new(font_test_data::VAZIRMATN_VAR).unwrap();
-        let loca = font.loca(None).unwrap();
-        let glyf = font.glyf().unwrap();
-        let glyph_count = font.maxp().unwrap().num_glyphs();
-        for gid in 0..glyph_count {
-            let glyph = match loca.get_glyf(GlyphId::new(gid), &glyf) {
-                Ok(Some(Glyph::Composite(glyph))) => glyph,
-                _ => continue,
-            };
-            // Only GID 2, component 1 has the overlap bit set
-            for (component_ix, component) in glyph.components().enumerate() {
-                if gid == 2 && component_ix == 1 {
-                    assert!(component
-                        .flags
-                        .contains(CompositeGlyphFlags::OVERLAP_COMPOUND))
-                } else {
-                    assert!(!component
-                        .flags
-                        .contains(CompositeGlyphFlags::OVERLAP_COMPOUND))
-                }
-            }
-        }
-    }
-
     #[test]
     fn compute_anchor_flags() {
         let anchor = Anchor::Offset { x: -128, y: 127 };