bendns' repos / dsb
Diffstat
-rw-r--r--Cargo.lock1
-rw-r--r--src/lib.rs34
2 files changed, 28 insertions, 7 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 9acd549..97fa6fa 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -200,6 +200,7 @@ checksum = "6a02dba6a60cd31533cf16561ced53239686d18f1464bff49579dd320fcea081"
[[package]]
name = "fimg"
version = "0.4.50"
+source = "git+https://github.com/bend-n/fimg#4ef37597ee44dff03d6fc55393c4e97baa080196"
dependencies = [
"array_chunks",
"atools 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/src/lib.rs b/src/lib.rs
index bf37072..2b2e575 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -95,6 +95,28 @@ impl<'a, 'b, 'c, 'd> Fonts<'a, 'b, 'c, 'd> {
}
}
}
+pub unsafe fn render_owned(
+ cells: &[Cell],
+ (c, r): (usize, usize),
+ ppem: f32,
+ fonts: &mut Fonts,
+ line_spacing: f32,
+ subpixel: bool,
+) -> Image<Box<[u8]>, 3> {
+ let (w, h) = size(&fonts.regular, ppem, line_spacing, (c, r));
+ let mut i = Image::build(w as _, h as _).fill([255; 3]);
+ render(
+ cells,
+ (c, r),
+ ppem,
+ fonts,
+ line_spacing,
+ subpixel,
+ i.as_mut(),
+ (0, 0),
+ );
+ i
+}
#[implicit_fn::implicit_fn]
pub unsafe fn render(
cells: &[Cell],
@@ -395,7 +417,7 @@ fn x() {
)
.unwrap()
});
- let mut i = Image::alloc(4000, 1000);
+
unsafe {
let z = [
Cell {
@@ -439,16 +461,14 @@ fn x() {
letter: Some(']'),
},
];
- render(
+ render_owned(
&z,
- (5, 0),
+ (5, 1),
200.0,
&mut Fonts::new(*FONT, *FONT, *FONT, *FONT),
2.0,
true,
- i.as_mut(),
- (20, 20),
- );
+ )
+ .show();
}
- i.show();
}