remove unsave webp-sys

Cargo.toml

@@ -35,7 +35,6 @@ image = "0.24"
 kamadak-exif = "0.5"
 lexical-sort = "0.3"
 libavif-image = {version = "0.11", optional = true}
-libwebp-sys = "0.9.2"
 log = "0.4"
 nalgebra = "0.32"
 notan = {version = "0.11", default-features = false, features = ["backend", "draw", "glsl-to-spirv","drop_files", "egui"]}

src/image_loader.rs

@@ -1,7 +1,6 @@
 use crate::ktx2_loader::CompressedImageFormats;
 use crate::utils::{fit, Frame, FrameSource};
 use crate::{ktx2_loader, FONT};
-use libwebp_sys::{WebPDecodeRGBA, WebPGetInfo};
 use log::{debug, error, info};
 use psd::Psd;
 
@@ -18,7 +17,6 @@ use std::fs::File;
 use std::io::BufReader;
 use std::path::Path;
 use std::sync::mpsc::{channel, Receiver, Sender};
-use std::time::SystemTime;
 use tiff::decoder::Limits;
 use usvg::{TreeParsing, TreeTextToPath};
 use webp_animation::prelude::*;
@@ -437,18 +435,15 @@ pub fn open_image(img_location: &Path) -> Result<Receiver<Frame>> {
             // return Ok(receiver);
 
             let buffer = std::fs::read(img_location)?;
-
-            let decoder = Decoder::new(&buffer)?;
-
-            let mut dec_iter = decoder.into_iter();
+            let mut decoder = Decoder::new(&buffer)?.into_iter();
 
             let mut last_timestamp = 0;
 
             let mut frames = vec![];
             let mut i = 0;
 
             loop {
-                if let Some(frame) = dec_iter.next() {
+                if let Some(frame) = decoder.next() {
                     if frames.len() > 1 {
                         if let Some(last) = frames.pop() {
                             _ = sender.send(last);
@@ -472,12 +467,15 @@ pub fn open_image(img_location: &Path) -> Result<Receiver<Frame>> {
             }
 
             if i == 1 {
-                info!("This is a still");
+                debug!("This is a still");
                 if let Some(mut last) = frames.pop() {
                     last.source = FrameSource::Still;
                     _ = sender.send(last);
                 }
-                // _ = sender.send(Frame::new(buf, delay as u16, FrameSource::Animation));
+            } else {
+                for f in frames {
+                    _ = sender.send(f);
+                }
             }
 
             // TODO: Use thread for animation and return receiver immediately
@@ -681,21 +679,6 @@ fn tonemap_rgb(px: [f32; 3]) -> [u8; 4] {
     tm
 }
 
-// Unsafe webp decoding using webp-sys
-fn decode_webp(buf: &[u8]) -> Option<RgbaImage> {
-    let mut width = 0;
-    let mut height = 0;
-    let len = buf.len();
-    let webp_buffer: Vec<u8>;
-    unsafe {
-        WebPGetInfo(buf.as_ptr(), len, &mut width, &mut height);
-        let out_buf = WebPDecodeRGBA(buf.as_ptr(), len, &mut width, &mut height);
-        let len = width * height * 4;
-        webp_buffer = Vec::from_raw_parts(out_buf, len as usize, len as usize);
-    }
-    image::ImageBuffer::from_raw(width as u32, height as u32, webp_buffer)
-}
-
 fn u16_to_u8(p: u16) -> u8 {
     ((p as f32 / u16::MAX as f32) * u8::MAX as f32) as u8
 }