Added workaround for build error.

Author: mkrueger

crates/icy_engine/Cargo.toml

@@ -40,7 +40,9 @@ libyaff = { workspace = true }
 
 # Image export support
 image = { workspace = true }
-#gifski = "1.32.0"
+gifski = "1.32.0"
+lodepng = {version ="3.12.1", default-features = false, features = ["cfzlib"] }
+
 imgref = "1.12.0"
 rgb = "0.8.52"
 

crates/icy_engine/src/formats/image_format.rs

@@ -157,60 +157,59 @@ impl ImageFormat {
     }
 
     fn save_screen_gif(&self, screen: &dyn Screen, path: &Path, region: Rectangle) -> EngineResult<()> {
-        /*     use gifski::{Repeat, progress::NoProgress};
-
-                let size = screen.get_size();
-                let dim = screen.get_font_dimensions();
-                let width = (region.get_width().min(size.width) * dim.width) as usize;
-                let height = (region.get_height().min(size.height) * dim.height) as usize;
-
-                // Get blink rate from the screen's buffer type (in milliseconds)
-                let blink_rate_ms = screen.buffer_type().get_blink_rate();
-                let blink_rate_secs = blink_rate_ms as f64 / 1000.0;
-
-                let settings = gifski::Settings {
-                    width: Some(width as u32),
-                    height: Some(height as u32),
-                    quality: 100,
-                    fast: true,
-                    repeat: Repeat::Infinite,
-                };
-
-                let (collector, writer) = gifski::new(settings)?;
-
-                let fs = std::fs::File::create(path)?;
-                let mut pb = NoProgress {};
-
-                let path_clone = path.to_path_buf();
-                let writer_handle = std::thread::spawn(move || {
-                    if let Err(e) = writer.write(fs, &mut pb) {
-                        log::error!("GIF writer error for {:?}: {}", path_clone, e);
-                    }
-                });
-
-                // Frame 1: blink_on = true (visible)
-                let options1 = RenderOptions {
-                    rect: region.into(),
-                    blink_on: true,
-                    ..Default::default()
-                };
-                let (frame1_size, frame1_data) = screen.render_to_rgba(&options1);
-                let img1 = Self::create_imgref(frame1_data, frame1_size);
-                collector.add_frame_rgba(0, img1, 0.0)?;
-
-                // Frame 2: blink_on = false (hidden) - use screen's blink rate
-                let options2 = RenderOptions {
-                    rect: region.into(),
-                    blink_on: false,
-                    ..Default::default()
-                };
-                let (frame2_size, frame2_data) = screen.render_to_rgba(&options2);
-                let img2 = Self::create_imgref(frame2_data, frame2_size);
-                collector.add_frame_rgba(1, img2, blink_rate_secs)?;
-
-                drop(collector);
-                writer_handle.join().map_err(|_| anyhow::anyhow!("GIF writer thread panicked"))?;
-        */
+        use gifski::{Repeat, progress::NoProgress};
+
+        let size = screen.get_size();
+        let dim = screen.get_font_dimensions();
+        let width = (region.get_width().min(size.width) * dim.width) as usize;
+        let height = (region.get_height().min(size.height) * dim.height) as usize;
+
+        // Get blink rate from the screen's buffer type (in milliseconds)
+        let blink_rate_ms = screen.buffer_type().get_blink_rate();
+        let blink_rate_secs = blink_rate_ms as f64 / 1000.0;
+
+        let settings = gifski::Settings {
+            width: Some(width as u32),
+            height: Some(height as u32),
+            quality: 100,
+            fast: true,
+            repeat: Repeat::Infinite,
+        };
+
+        let (collector, writer) = gifski::new(settings)?;
+
+        let fs = std::fs::File::create(path)?;
+        let mut pb = NoProgress {};
+
+        let path_clone = path.to_path_buf();
+        let writer_handle = std::thread::spawn(move || {
+            if let Err(e) = writer.write(fs, &mut pb) {
+                log::error!("GIF writer error for {:?}: {}", path_clone, e);
+            }
+        });
+
+        // Frame 1: blink_on = true (visible)
+        let options1 = RenderOptions {
+            rect: region.into(),
+            blink_on: true,
+            ..Default::default()
+        };
+        let (frame1_size, frame1_data) = screen.render_to_rgba(&options1);
+        let img1 = Self::create_imgref(frame1_data, frame1_size);
+        collector.add_frame_rgba(0, img1, 0.0)?;
+
+        // Frame 2: blink_on = false (hidden) - use screen's blink rate
+        let options2 = RenderOptions {
+            rect: region.into(),
+            blink_on: false,
+            ..Default::default()
+        };
+        let (frame2_size, frame2_data) = screen.render_to_rgba(&options2);
+        let img2 = Self::create_imgref(frame2_data, frame2_size);
+        collector.add_frame_rgba(1, img2, blink_rate_secs)?;
+
+        drop(collector);
+        writer_handle.join().map_err(|_| anyhow::anyhow!("GIF writer thread panicked"))?;
         Ok(())
     }
 
@@ -273,65 +272,64 @@ impl ImageFormat {
     }
 
     fn save_gif(&self, buffer: &TextBuffer, path: &Path, region: Rectangle) -> EngineResult<()> {
-        /*use gifski::{Repeat, progress::NoProgress};
-
-                let size = buffer.get_size();
-                let dim = buffer.get_font_dimensions();
-                let width = (region.get_width().min(size.width) * dim.width) as usize;
-                let height = (region.get_height().min(size.height) * dim.height) as usize;
-
-                // Get blink rate from the buffer's type (in milliseconds)
-                let blink_rate_ms = buffer.buffer_type.get_blink_rate();
-                let blink_rate_secs = blink_rate_ms as f64 / 1000.0;
-
-                let settings = gifski::Settings {
-                    width: Some(width as u32),
-                    height: Some(height as u32),
-                    quality: 100,
-                    fast: true,
-                    repeat: Repeat::Infinite,
-                };
-
-                let (collector, writer) = gifski::new(settings)?;
-
-                let fs = std::fs::File::create(path)?;
-                let mut pb = NoProgress {};
-
-                // Spawn writer thread
-                let path_clone = path.to_path_buf();
-                let writer_handle = std::thread::spawn(move || {
-                    if let Err(e) = writer.write(fs, &mut pb) {
-                        log::error!("GIF writer error for {:?}: {}", path_clone, e);
-                    }
-                });
-
-                // Frame 1: blink_on = true (visible)
-                let options1 = RenderOptions {
-                    rect: region.into(),
-                    blink_on: true,
-                    ..Default::default()
-                };
-                let scan_lines = options1.override_scan_lines.unwrap_or(false);
-                let (frame1_size, frame1_data) = buffer.render_to_rgba(&options1, scan_lines);
-                let img1 = Self::create_imgref(frame1_data, frame1_size);
-                collector.add_frame_rgba(0, img1, 0.0)?;
-
-                // Frame 2: blink_on = false (hidden) - use buffer's blink rate
-                let options2 = RenderOptions {
-                    rect: region.into(),
-                    blink_on: false,
-                    ..Default::default()
-                };
-                let (frame2_size, frame2_data) = buffer.render_to_rgba(&options2, scan_lines);
-                let img2 = Self::create_imgref(frame2_data, frame2_size);
-                collector.add_frame_rgba(1, img2, blink_rate_secs)?;
-
-                // Drop collector to signal completion
-                drop(collector);
-
-                // Wait for writer to finish
-                writer_handle.join().map_err(|_| anyhow::anyhow!("GIF writer thread panicked"))?;
-        */
+        use gifski::{Repeat, progress::NoProgress};
+
+        let size = buffer.get_size();
+        let dim = buffer.get_font_dimensions();
+        let width = (region.get_width().min(size.width) * dim.width) as usize;
+        let height = (region.get_height().min(size.height) * dim.height) as usize;
+
+        // Get blink rate from the buffer's type (in milliseconds)
+        let blink_rate_ms = buffer.buffer_type.get_blink_rate();
+        let blink_rate_secs = blink_rate_ms as f64 / 1000.0;
+
+        let settings = gifski::Settings {
+            width: Some(width as u32),
+            height: Some(height as u32),
+            quality: 100,
+            fast: true,
+            repeat: Repeat::Infinite,
+        };
+
+        let (collector, writer) = gifski::new(settings)?;
+
+        let fs = std::fs::File::create(path)?;
+        let mut pb = NoProgress {};
+
+        // Spawn writer thread
+        let path_clone = path.to_path_buf();
+        let writer_handle = std::thread::spawn(move || {
+            if let Err(e) = writer.write(fs, &mut pb) {
+                log::error!("GIF writer error for {:?}: {}", path_clone, e);
+            }
+        });
+
+        // Frame 1: blink_on = true (visible)
+        let options1 = RenderOptions {
+            rect: region.into(),
+            blink_on: true,
+            ..Default::default()
+        };
+        let scan_lines = options1.override_scan_lines.unwrap_or(false);
+        let (frame1_size, frame1_data) = buffer.render_to_rgba(&options1, scan_lines);
+        let img1 = Self::create_imgref(frame1_data, frame1_size);
+        collector.add_frame_rgba(0, img1, 0.0)?;
+
+        // Frame 2: blink_on = false (hidden) - use buffer's blink rate
+        let options2 = RenderOptions {
+            rect: region.into(),
+            blink_on: false,
+            ..Default::default()
+        };
+        let (frame2_size, frame2_data) = buffer.render_to_rgba(&options2, scan_lines);
+        let img2 = Self::create_imgref(frame2_data, frame2_size);
+        collector.add_frame_rgba(1, img2, blink_rate_secs)?;
+
+        // Drop collector to signal completion
+        drop(collector);
+
+        // Wait for writer to finish
+        writer_handle.join().map_err(|_| anyhow::anyhow!("GIF writer thread panicked"))?;
         Ok(())
     }