Merge pull request #7 from forkgull/uninit

Remove unsound casting of undefined data to defined data

Cargo.toml

@@ -14,9 +14,16 @@ readme = "README.md"
 [dependencies]
 libm = { version = "0.2.7", default-features = false, optional = true }
 
+[dev-dependencies]
+criterion = { version = "0.5.1", default-features = false, features = ["cargo_bench_support"] }
+fastrand = { version = "2.0.1", default-features = false }
+
 [features]
 default = ["eval", "std"]
 eval = []
 std = []
 libm = ["dep:libm"]
 
+[[bench]]
+name = "render"
+harness = false

benches/render.rs

@@ -0,0 +1,81 @@
+//! Rendering benchmarks.
+
+use criterion::{criterion_group, criterion_main, Criterion, black_box};
+use fastrand::Rng;
+use zeno::{Scratch, PathBuilder, Command, Mask, Style};
+
+fn drawing(c: &mut Criterion) {
+    // Set up buffers for rendering.
+    let mut buffer = Box::new([0u8; 1024 * 1024]);
+    let mut scratch = Scratch::new();
+    let mut rng = Rng::with_seed(0x12345678);
+
+    c.bench_function("fill_square", |b| {
+        let path = {
+            let mut path = Vec::<Command>::new();
+            path.add_rect(
+                (5.0, 5.0),
+                1000.0,
+                1000.0
+            );
+            path
+        };
+
+        b.iter(|| {
+            Mask::with_scratch(&path, &mut scratch)
+                .style(Style::Fill(zeno::Fill::EvenOdd))
+                .render_into(&mut *buffer, None);
+            black_box((&mut scratch, &mut buffer));
+        });
+    });
+
+    c.bench_function("complicated_shape", |b| {
+        // Create a weird, jagged circle.
+        let path = {
+            let (center_x, center_y) = (500.0, 500.0);
+            let radius = 450.0;
+            let mut path = Vec::<Command>::new();
+
+            path.move_to((center_x, center_y));
+
+            for i in 0..500 {
+                let angle = core::f32::consts::PI * 2.0 * (i as f32) / 500.0;
+                let pt_x = center_x + (angle.cos() * radius) + rng.f32();
+                let pt_y = center_y + (angle.sin() * radius) + rng.f32();
+                path.line_to((pt_x, pt_y));
+            }
+
+            path.close();
+            path
+        };
+
+        b.iter(|| {
+            Mask::with_scratch(&path, &mut scratch)
+                .style(Style::Fill(zeno::Fill::EvenOdd))
+                .render_into(&mut *buffer, None);
+            black_box((&mut scratch, &mut buffer));
+        })
+    });
+
+    c.bench_function("circle", |b| {
+        let path = {
+            let mut path = Vec::<Command>::new();
+            path.add_circle((500.0, 500.0), 450.0);
+            path
+        };
+
+        b.iter(|| {
+            Mask::with_scratch(&path, &mut scratch)
+                .style(Style::Fill(zeno::Fill::EvenOdd))
+                .render_into(&mut *buffer, None);
+            black_box((&mut scratch, &mut buffer));
+        });
+    });
+}
+
+criterion_group!(
+    benches,
+    drawing
+);
+
+criterion_main!(benches);

src/raster.rs

@@ -381,8 +381,7 @@ impl<'a, S: RasterStorage> Rasterizer<'a, S> {
 
     #[allow(clippy::uninit_assumed_init, invalid_value)]
     fn quad_to(&mut self, control: FixedPoint, to: FixedPoint) {
-        let mut arc: [FixedPoint; 16 * 2 + 1] =
-            unsafe { core::mem::MaybeUninit::uninit().assume_init() };
+        let mut arc = [FixedPoint::default(); 16 * 2 + 1];
         arc[0].x = to.x;
         arc[0].y = to.y;
         arc[1].x = control.x;
@@ -433,8 +432,7 @@ impl<'a, S: RasterStorage> Rasterizer<'a, S> {
 
     #[allow(clippy::uninit_assumed_init, invalid_value)]
     fn curve_to(&mut self, control1: FixedPoint, control2: FixedPoint, to: FixedPoint) {
-        let mut arc: [FixedPoint; 16 * 8 + 1] =
-            unsafe { core::mem::MaybeUninit::uninit().assume_init() };
+        let mut arc = [FixedPoint::default(); 16 * 8 + 1];
         arc[0].x = to.x;
         arc[0].y = to.y;
         arc[1].x = control2.x;
@@ -552,7 +550,7 @@ impl<'a, S: RasterStorage> PathBuilder for Rasterizer<'a, S> {
     }
 }
 
-#[derive(Copy, Clone)]
+#[derive(Copy, Clone, Default)]
 pub struct Cell {
     x: i32,
     cover: i32,
@@ -648,9 +646,9 @@ impl AdaptiveStorage {
             max: FixedPoint::default(),
             height: 0,
             cell_count: 0,
-            cells: unsafe { core::mem::MaybeUninit::uninit().assume_init() },
+            cells: [Default::default(); MAX_CELLS],
             heap_cells: Vec::new(),
-            indices: unsafe { core::mem::MaybeUninit::uninit().assume_init() },
+            indices: [Default::default(); MAX_BAND],
             heap_indices: Vec::new(),
         }
     }