Fix AFM handling, a little more safety and debug asserts

Author: CraftSpider

crates/bridge_harfbuzz/src/font_funcs.rs

@@ -84,6 +84,8 @@ unsafe extern "C" fn glyph_origin<
             true as sys::hb_bool_t
         }
         None => {
+            debug_assert_eq!(*x, 0);
+            debug_assert_eq!(*y, 0);
             *x = 0;
             *y = 0;
             false as sys::hb_bool_t
@@ -148,6 +150,8 @@ unsafe extern "C" fn glyph_contour_point<
             true as sys::hb_bool_t
         }
         None => {
+            debug_assert_eq!(*x, 0);
+            debug_assert_eq!(*y, 0);
             *x = 0;
             *y = 0;
             false as sys::hb_bool_t

crates/xetex_layout/src/c_api/engine.rs

@@ -452,26 +452,28 @@ pub unsafe extern "C" fn getGlyphs(engine: XeTeXLayoutEngine, glyphs: *mut u32)
 
 #[no_mangle]
 pub unsafe extern "C" fn getGlyphAdvances(engine: XeTeXLayoutEngine, advances: *mut f32) {
-    let hb_positions = (*engine).hb_buffer.get_glyph_position();
+    let engine = &*engine;
+    let hb_positions = engine.hb_buffer.get_glyph_position();
 
     for (i, pos) in hb_positions.iter().enumerate() {
-        let advance = if (*engine).font().layout_dir_vertical() {
+        let advance = if engine.font().layout_dir_vertical() {
             pos.y_advance
         } else {
             pos.x_advance
         };
 
-        *advances.add(i) = (*engine).font().units_to_points(advance as f64) as f32;
+        *advances.add(i) = engine.font().units_to_points(advance as f64) as f32;
     }
 }
 
 #[no_mangle]
 pub unsafe extern "C" fn getGlyphPositions(engine: XeTeXLayoutEngine, positions: *mut FloatPoint) {
-    let hb_positions = (*engine).hb_buffer.get_glyph_position();
+    let engine = &mut *engine;
+    let hb_positions = engine.hb_buffer.get_glyph_position();
 
     let mut x: f32 = 0.0;
     let mut y: f32 = 0.0;
-    let font = (*engine).font();
+    let font = engine.font();
 
     if font.layout_dir_vertical() {
         for (i, pos) in hb_positions.iter().enumerate() {
@@ -494,10 +496,10 @@ pub unsafe extern "C" fn getGlyphPositions(engine: XeTeXLayoutEngine, positions:
         (*positions.add(hb_positions.len())).y = -font.units_to_points(y as f64) as f32;
     }
 
-    if (*engine).extend != 1.0 || (*engine).slant != 0.0 {
+    if engine.extend != 1.0 || engine.slant != 0.0 {
         for i in 0..=hb_positions.len() {
             let pos = &mut *positions.add(i);
-            pos.x = pos.x * (*engine).extend - pos.y * (*engine).slant;
+            pos.x = pos.x * engine.extend - pos.y * engine.slant;
         }
     }
 }
@@ -565,14 +567,15 @@ pub unsafe extern "C" fn getGraphiteFeatureDefaultSetting(
     engine: XeTeXLayoutEngine,
     feature_id: u32,
 ) -> u32 {
-    let hb_face = (*engine).font().get_hb_font().get_face();
+    let engine = &*engine;
+    let hb_face = engine.font().get_hb_font().get_face();
     let gr_face = hb_face.get_gr_face();
 
     if !gr_face.is_null() {
         let feature = gr_face_find_fref(gr_face, feature_id);
         let feature_values = gr_face_featureval_for_lang(
             gr_face,
-            hb::Tag::from_cstr((*engine).language.to_string()).to_raw(),
+            hb::Tag::from_cstr(engine.language.to_string()).to_raw(),
         );
 
         gr_fref_feature_value(feature, feature_values) as u32
@@ -745,7 +748,8 @@ pub unsafe extern "C" fn initGraphiteBreaking(
     txt_ptr: *const u16,
     txt_len: libc::c_uint,
 ) -> bool {
-    let hb_font = (*engine).font().get_hb_font();
+    let engine = &*engine;
+    let hb_font = engine.font().get_hb_font();
     let hb_face = hb_font.get_face();
     let gr_face = hb_face.get_gr_face();
     let gr_font = gr_make_font(hb_font.get_ptem(), gr_face);
@@ -761,11 +765,11 @@ pub unsafe extern "C" fn initGraphiteBreaking(
 
         let gr_feature_values = gr_face_featureval_for_lang(
             gr_face,
-            hb::Tag::from_cstr((*engine).language.to_string()).to_raw(),
+            hb::Tag::from_cstr(engine.language.to_string()).to_raw(),
         );
 
-        let features = (*engine).features;
-        for i in (0..(*engine).features.len()).rev() {
+        let features = engine.features;
+        for i in (0..engine.features.len()).rev() {
             let fref = gr_face_find_fref(gr_face, features[i].tag);
             if !fref.is_null() {
                 gr_fref_set_feature_value(fref, features[i].value as u16, gr_feature_values);
@@ -775,7 +779,7 @@ pub unsafe extern "C" fn initGraphiteBreaking(
         GR_SEGMENT.set(gr_make_seg(
             gr_font,
             gr_face,
-            (*engine).script.to_raw(),
+            engine.script.to_raw(),
             gr_feature_values,
             gr_encform::utf16,
             txt_ptr.cast(),

crates/xetex_layout/src/c_api/font.rs

@@ -373,11 +373,11 @@ impl XeTeXFontBase {
                 .to_vec();
             let file_ty = afm.rsplit_mut(|c| *c == b'.').next();
             if let Some(file_ty) = file_ty {
-                if file_ty.len() == 4
-                    && file_ty[1].to_ascii_lowercase() == b'p'
-                    && file_ty[2].to_ascii_lowercase() == b'f'
+                if file_ty.len() == 3
+                    && file_ty[0].to_ascii_lowercase() == b'p'
+                    && file_ty[1].to_ascii_lowercase() == b'f'
                 {
-                    file_ty.copy_from_slice(b".afm");
+                    file_ty.copy_from_slice(b"afm");
                 }
             }
             afm.push(0);

crates/xetex_layout/src/c_api/manager.rs

@@ -126,7 +126,7 @@ unsafe fn base_get_op_size_rec_and_style_flags(font: &mut Font) {
         Err(_) => return,
     };
 
-    let size_rec = FontManager::get_op_size(&mut xfont);
+    let size_rec = FontManager::get_op_size(&xfont);
     if let Some(size_rec) = size_rec {
         font.op_size_info.design_size = size_rec.design_size;
         if size_rec.sub_family_id != 0
@@ -668,7 +668,7 @@ impl FontManager {
         name.as_ptr()
     }
 
-    pub unsafe fn get_design_size(&self, font: XeTeXFont) -> f64 {
+    pub fn get_design_size(&self, font: &XeTeXFontBase) -> f64 {
         let size_rec = Self::get_op_size(font);
         match size_rec {
             None => 10.0,
@@ -740,8 +740,8 @@ impl FontManager {
         list.insert(0, str.into());
     }
 
-    pub unsafe fn get_op_size(font: XeTeXFont) -> Option<OpSizeRec> {
-        let hb_font = (*font).try_get_hb_font()?;
+    pub fn get_op_size(font: &XeTeXFontBase) -> Option<OpSizeRec> {
+        let hb_font = font.try_get_hb_font()?;
 
         let face = hb_font.get_face();
 
@@ -823,7 +823,7 @@ pub unsafe extern "C" fn getFullName(font: RawPlatformFontRef) -> *const libc::c
 
 #[no_mangle]
 pub unsafe extern "C" fn getDesignSize(font: XeTeXFont) -> f64 {
-    FontManager::with_font_manager(|mgr| mgr.get_design_size(font))
+    FontManager::with_font_manager(|mgr| mgr.get_design_size(&*font))
 }
 
 #[no_mangle]