Finish CBDT support

LaurenzV · Aug 30, 2024 · 8c0afbc · 8c0afbc
1 parent 7462c22
commit 8c0afbc
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 5 deletions.
diff --git a/assets/refs/noto_color_emoji_cbdt.png b/assets/refs/noto_color_emoji_cbdt.png
diff --git a/assets/refs/noto_color_emoji.png → assets/refs/noto_color_emoji_colr.png b/assets/refs/noto_color_emoji.png → assets/refs/noto_color_emoji_colr.png
diff --git a/src/font/bitmap.rs b/src/font/bitmap.rs
@@ -2,9 +2,8 @@ use crate::error::{KrillaError, KrillaResult};
 use crate::font::Font;
 use crate::object::image::Image;
 use crate::surface::Surface;
-use skrifa::raw::TableProvider;
-use skrifa::{GlyphId, MetadataProvider, Tag};
-use tiny_skia_path::{Size, Transform};
+use skrifa::{GlyphId, MetadataProvider};
+use tiny_skia_path::Transform;
 use crate::font::bitmap::utils::{BitmapData, BitmapFormat, BitmapStrikes, Origin};
 
 /// Draw a bitmap-based glyph on a surface.

diff --git a/src/tests/mod.rs b/src/tests/mod.rs
@@ -76,6 +76,8 @@ lazy_font!(COLR_TEST_GLYPHS, FONT_PATH.join("colr_test_glyphs.ttf"));
 #[rustfmt::skip]
 lazy_font!(NOTO_COLOR_EMOJI_COLR, FONT_PATH.join("NotoColorEmoji.COLR.subset.ttf"));
 #[rustfmt::skip]
+lazy_font!(NOTO_COLOR_EMOJI_CBDT, FONT_PATH.join("NotoColorEmoji.CBDT.subset.ttf"));
+#[rustfmt::skip]
 lazy_font!(TWITTER_COLOR_EMOJI, FONT_PATH.join("TwitterColorEmoji.subset.ttf"));
 
 pub fn rect_to_path(x1: f32, y1: f32, x2: f32, y2: f32) -> Path {

diff --git a/src/tests/visreg.rs b/src/tests/visreg.rs
@@ -3,7 +3,7 @@ use crate::rgb::Rgb;
 use crate::stream::Glyph;
 use crate::surface::Surface;
 use crate::tests::manual::all_glyphs_to_pdf;
-use crate::tests::{COLR_TEST_GLYPHS, NOTO_COLOR_EMOJI_COLR, NOTO_SANS, TWITTER_COLOR_EMOJI};
+use crate::tests::{COLR_TEST_GLYPHS, NOTO_COLOR_EMOJI_CBDT, NOTO_COLOR_EMOJI_COLR, NOTO_SANS, TWITTER_COLOR_EMOJI};
 use crate::util::SliceExt;
 use crate::{rgb, Fill, LinearGradient, Paint, SpreadMethod, Stop};
 use cosmic_text::{Attrs, Buffer, FontSystem, Metrics, Shaping};
@@ -120,10 +120,15 @@ fn colr_test_glyphs(document: &mut Document) {
 }
 
 #[visreg(document)]
-fn noto_color_emoji(document: &mut Document) {
+fn noto_color_emoji_colr(document: &mut Document) {
     let font_data = NOTO_COLOR_EMOJI_COLR.clone();
     all_glyphs_to_pdf(font_data, None, document);
 }
+#[visreg(document)]
+fn noto_color_emoji_cbdt(document: &mut Document) {
+    let font_data = NOTO_COLOR_EMOJI_CBDT.clone();
+    all_glyphs_to_pdf(font_data, None, document);
+}
 
 #[visreg(document)]
 #[cfg(target_os = "macos")]