Skip to content

Commit 8c0afbc

Browse files
committed
Finish CBDT support
1 parent 7462c22 commit 8c0afbc

File tree

5 files changed

+11
-5
lines changed

5 files changed

+11
-5
lines changed

assets/refs/noto_color_emoji_cbdt.png

284 KB
Loading

src/font/bitmap.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@ use crate::error::{KrillaError, KrillaResult};
22
use crate::font::Font;
33
use crate::object::image::Image;
44
use crate::surface::Surface;
5-
use skrifa::raw::TableProvider;
6-
use skrifa::{GlyphId, MetadataProvider, Tag};
7-
use tiny_skia_path::{Size, Transform};
5+
use skrifa::{GlyphId, MetadataProvider};
6+
use tiny_skia_path::Transform;
87
use crate::font::bitmap::utils::{BitmapData, BitmapFormat, BitmapStrikes, Origin};
98

109
/// Draw a bitmap-based glyph on a surface.

src/tests/mod.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,8 @@ lazy_font!(COLR_TEST_GLYPHS, FONT_PATH.join("colr_test_glyphs.ttf"));
7676
#[rustfmt::skip]
7777
lazy_font!(NOTO_COLOR_EMOJI_COLR, FONT_PATH.join("NotoColorEmoji.COLR.subset.ttf"));
7878
#[rustfmt::skip]
79+
lazy_font!(NOTO_COLOR_EMOJI_CBDT, FONT_PATH.join("NotoColorEmoji.CBDT.subset.ttf"));
80+
#[rustfmt::skip]
7981
lazy_font!(TWITTER_COLOR_EMOJI, FONT_PATH.join("TwitterColorEmoji.subset.ttf"));
8082

8183
pub fn rect_to_path(x1: f32, y1: f32, x2: f32, y2: f32) -> Path {

src/tests/visreg.rs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use crate::rgb::Rgb;
33
use crate::stream::Glyph;
44
use crate::surface::Surface;
55
use crate::tests::manual::all_glyphs_to_pdf;
6-
use crate::tests::{COLR_TEST_GLYPHS, NOTO_COLOR_EMOJI_COLR, NOTO_SANS, TWITTER_COLOR_EMOJI};
6+
use crate::tests::{COLR_TEST_GLYPHS, NOTO_COLOR_EMOJI_CBDT, NOTO_COLOR_EMOJI_COLR, NOTO_SANS, TWITTER_COLOR_EMOJI};
77
use crate::util::SliceExt;
88
use crate::{rgb, Fill, LinearGradient, Paint, SpreadMethod, Stop};
99
use cosmic_text::{Attrs, Buffer, FontSystem, Metrics, Shaping};
@@ -120,10 +120,15 @@ fn colr_test_glyphs(document: &mut Document) {
120120
}
121121

122122
#[visreg(document)]
123-
fn noto_color_emoji(document: &mut Document) {
123+
fn noto_color_emoji_colr(document: &mut Document) {
124124
let font_data = NOTO_COLOR_EMOJI_COLR.clone();
125125
all_glyphs_to_pdf(font_data, None, document);
126126
}
127+
#[visreg(document)]
128+
fn noto_color_emoji_cbdt(document: &mut Document) {
129+
let font_data = NOTO_COLOR_EMOJI_CBDT.clone();
130+
all_glyphs_to_pdf(font_data, None, document);
131+
}
127132

128133
#[visreg(document)]
129134
#[cfg(target_os = "macos")]

0 commit comments

Comments
 (0)