feat: 0.0.1

Author: triniwiz

crates/canvas-2d/Cargo.toml

@@ -26,4 +26,5 @@ raw-window-handle.workspace = true
 bitflags = "2.6.0"
 
 [target.'cfg(any(target_os = "ios", target_os="macos"))'.dependencies]
-foreign-types-shared = "0.3.1"
+foreign-types-shared = "0.3.1"
+objc2-foundation = { version = "0.2.2", features = ["NSAutoreleasePool"] }

crates/canvas-2d/src/context/drawing_images/mod.rs

@@ -147,6 +147,8 @@ impl Context {
     }
 
     pub fn draw_image_dx_dy(&mut self, image: &Image, x: f32, y: f32) {
+        #[cfg(any(target_os = "macos", target_os = "ios"))]
+        let _ = unsafe { objc2_foundation::NSAutoreleasePool::new() };
         #[cfg(feature = "gl")]{
             if let Some(ref context) = self.gl_context {
                 context.make_current();
@@ -174,6 +176,8 @@ impl Context {
     }
 
     fn draw_image(&mut self, image: &Image, src_rect: impl Into<Rect>, dst_rect: impl Into<Rect>) {
+        #[cfg(any(target_os = "macos", target_os = "ios"))]
+        let _ = unsafe { objc2_foundation::NSAutoreleasePool::new() };
         #[cfg(feature = "gl")]{
             if let Some(ref context) = self.gl_context {
                 context.make_current();
@@ -209,7 +213,8 @@ impl Context {
     }
 
     fn draw_image_with_rect(&mut self, image: &Image, dst_rect: impl Into<Rect>) {
-
+        #[cfg(any(target_os = "macos", target_os = "ios"))]
+        let _ = unsafe { objc2_foundation::NSAutoreleasePool::new() };
         #[cfg(feature = "gl")]{
             if let Some(ref context) = self.gl_context {
                 context.make_current();

crates/canvas-2d/src/context/drawing_paths/mod.rs

@@ -2,16 +2,21 @@ use std::borrow::BorrowMut;
 
 use skia_safe::{ClipOp, Matrix, Point};
 
-use crate::context::Context;
 use crate::context::drawing_paths::fill_rule::FillRule;
 use crate::context::paths::path::Path;
+use crate::context::Context;
 
 pub mod fill_rule;
 
 impl Context {
-    fn fill_or_stroke(&mut self, is_fill: bool, path: Option<&mut Path>, fill_rule: Option<FillRule>) {
-
-        #[cfg(feature = "gl")]{
+    fn fill_or_stroke(
+        &mut self,
+        is_fill: bool,
+        path: Option<&mut Path>,
+        fill_rule: Option<FillRule>,
+    ) {
+        #[cfg(feature = "gl")]
+        {
             if let Some(ref context) = self.gl_context {
                 context.make_current();
             }
@@ -42,6 +47,9 @@ impl Context {
             )
         };
 
+        #[cfg(any(target_os = "macos", target_os = "ios"))]
+        let pool = unsafe { objc2_foundation::NSAutoreleasePool::new() };
+
         self.render_to_canvas(&paint, |canvas, paint| {
             if let Some(paint) = &shadow_paint {
                 canvas.draw_path(path, paint);

crates/canvas-2d/src/context/fill_and_stroke_styles/paint.rs

@@ -51,6 +51,7 @@ impl PaintStyle {
         blue
     }
 
+    #[inline]
     pub fn new_color_str(color: &str) -> Option<Self> {
         parse(color)
             .map(|color| {

crates/canvas-2d/src/context/pixel_manipulation/image_data.rs

@@ -14,6 +14,7 @@ struct ImageDataInner {
 }
 
 unsafe impl Send for ImageDataInner {}
+unsafe impl Sync for ImageDataInner {}
 
 #[derive(Debug, Clone)]
 pub struct ImageData(ImageDataInner);

crates/canvas-c/src/lib.rs

@@ -49,6 +49,16 @@ pub enum InvalidateState {
     Invalidating,
 }
 
+impl Into<u32> for InvalidateState {
+    fn into(self) -> u32 {
+        match self {
+            InvalidateState::None => 0,
+            InvalidateState::Pending => 1,
+            InvalidateState::Invalidating => 2,
+        }
+    }
+}
+
 /* Helpers */
 
 #[no_mangle]
@@ -83,7 +93,6 @@ pub extern "C" fn canvas_native_font_add_family(
     }
 }
 
-
 #[no_mangle]
 pub extern "C" fn canvas_native_font_add_family_with_bytes(
     alias: *const c_char,
@@ -106,7 +115,6 @@ pub extern "C" fn canvas_native_font_add_family_with_bytes(
     }
 }
 
-
 #[no_mangle]
 pub extern "C" fn canvas_native_context_2d_test(context: i64) {
     if context == 0 {
@@ -124,7 +132,6 @@ pub extern "C" fn canvas_native_context_2d_test(context: i64) {
     context.render();
 }
 
-
 #[no_mangle]
 pub extern "C" fn canvas_native_context_2d_path_test(context: i64) {
     if context == 0 {
@@ -157,7 +164,6 @@ pub extern "C" fn canvas_native_context_2d_path_test(context: i64) {
     context.render();
 }
 
-
 #[no_mangle]
 pub extern "C" fn canvas_native_context_2d_conic_test(context: i64) {
     if context == 0 {
@@ -184,8 +190,10 @@ pub extern "C" fn canvas_native_context_2d_conic_test(context: i64) {
         gradient.add_color_stop(1., Color::BLUE);
 
         // Set the fill style and draw a rectangle
-        ctx.set_fill_style(canvas_2d::context::fill_and_stroke_styles::paint::PaintStyle::Gradient(gradient));
+        ctx.set_fill_style(
+            canvas_2d::context::fill_and_stroke_styles::paint::PaintStyle::Gradient(gradient),
+        );
         ctx.fill_rect_xywh(20., 20., 200., 200.);
     }
     context.render();
-}
+}