Merge pull request #2 from tychedelia/pyo3/image_class

Take image by ref.

Author: catilac

crates/processing_pyo3/examples/background_image.py

@@ -1,17 +1,13 @@
 from processing import *
 
-i = None 
-
 def setup():
     global i
     size(800, 600)
     i = image("images/logo.png")
 
 
 def draw():
-    global i
     background(220, 100, 24)
-    # i = image("images/logo.png")
     background(i)
 
 

crates/processing_pyo3/src/graphics.rs

@@ -24,17 +24,16 @@ impl Drop for Surface {
 }
 
 #[pyclass]
-#[derive(Clone, Debug)]
+#[derive(Debug)]
 pub struct Image {
     entity: Entity,
 }
 
-// TODO: we lose the image if this is implemented, meaning that the image is getting dropped prematurely
-// impl Drop for Image {
-//     fn drop(&mut self) {
-//         let _ = image_destroy(self.entity);
-//     }
-// }
+impl Drop for Image {
+    fn drop(&mut self) {
+        let _ = image_destroy(self.entity);
+    }
+}
 
 #[pyclass(unsendable)]
 pub struct Graphics {
@@ -84,7 +83,7 @@ impl Graphics {
             .map_err(|e| PyRuntimeError::new_err(format!("{e}")))
     }
 
-    pub fn background_image(&self, image: Image) -> PyResult<()> {
+    pub fn background_image(&self, image: &Image) -> PyResult<()> {
         graphics_record_command(self.entity, DrawCommand::BackgroundImage(image.entity))
             .map_err(|e| PyRuntimeError::new_err(format!("{e}")))
     }

crates/processing_pyo3/src/lib.rs

@@ -102,7 +102,7 @@ fn run(module: &Bound<'_, PyModule>) -> PyResult<()> {
 fn background(module: &Bound<'_, PyModule>, args: &Bound<'_, PyTuple>) -> PyResult<()> {
     let first = args.get_item(0)?;
     if first.is_instance_of::<Image>() {
-        get_graphics(module)?.background_image(first.extract::<Image>()?)
+        get_graphics(module)?.background_image(&*first.extract::<PyRef<Image>>()?)
     } else {
         get_graphics(module)?.background(args.extract()?)
     }