From 859c1b07c619496945bf8d0249bf787a8d701285 Mon Sep 17 00:00:00 2001 From: Leon Teichroeb Date: Sat, 12 Oct 2024 19:14:35 +0200 Subject: [PATCH 1/3] Add libfontconfig-dev dependency for version bump to Ubuntu 24.04 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b363d73..19586e3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,7 +28,7 @@ jobs: - name: Install run: | echo ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true | sudo debconf-set-selections; - sudo apt-get install ttf-mscorefonts-installer; + sudo apt-get install ttf-mscorefonts-installer libfontconfig-dev; - name: Build run: cargo build - name: Tests From d20ec59750002370a06095a5ec379c4249a102f9 Mon Sep 17 00:00:00 2001 From: Leon Teichroeb Date: Sat, 12 Oct 2024 19:22:14 +0200 Subject: [PATCH 2/3] Fix formatting errors. --- src/canvas.rs | 2 +- tests/tests.rs | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/canvas.rs b/src/canvas.rs index 896ebe1..9f38c62 100644 --- a/src/canvas.rs +++ b/src/canvas.rs @@ -107,7 +107,7 @@ impl Canvas { src_stride >= src_size.x() as usize * src_format.bytes_per_pixel() as usize, "src_stride must be >= than src_size.x()" ); - + let dst_rect = RectI::new(dst_point, src_size); let dst_rect = dst_rect.intersection(RectI::new(Vector2I::default(), self.size)); diff --git a/tests/tests.rs b/tests/tests.rs index 25fe61c..50bbef2 100644 --- a/tests/tests.rs +++ b/tests/tests.rs @@ -847,7 +847,7 @@ pub fn rasterize_glyph_with_full_hinting_subpixel() { ) .unwrap(); check_L_shape(&canvas); - + // Test with larger canvas let mut canvas = Canvas::new(Vector2I::new(100, 100), Format::Rgb24); font.rasterize_glyph( @@ -862,7 +862,6 @@ pub fn rasterize_glyph_with_full_hinting_subpixel() { check_L_shape(&canvas); } - #[cfg(all(feature = "source", target_family = "windows"))] #[test] pub fn rasterize_glyph() { @@ -943,7 +942,6 @@ pub fn rasterize_empty_glyph_on_empty_canvas() { .unwrap(); } - #[cfg(feature = "source")] #[test] pub fn font_transform() { From 7192f4cdf00c9acf5af4f01a175e800fe3891876 Mon Sep 17 00:00:00 2001 From: Leon Teichroeb Date: Sat, 12 Oct 2024 19:23:57 +0200 Subject: [PATCH 3/3] Fix formatting --- src/canvas.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/canvas.rs b/src/canvas.rs index 9f38c62..12590fe 100644 --- a/src/canvas.rs +++ b/src/canvas.rs @@ -108,7 +108,6 @@ impl Canvas { "src_stride must be >= than src_size.x()" ); - let dst_rect = RectI::new(dst_point, src_size); let dst_rect = dst_rect.intersection(RectI::new(Vector2I::default(), self.size)); let dst_rect = match dst_rect {