Dynamicimage

.gitignore

@@ -11,4 +11,5 @@ perf.*
 flamegraph.svg
 .notes
 TODO
-debug.png
+debug.png
+.idea

Cargo.toml

@@ -25,7 +25,7 @@ dirs = "5.0"
 env_logger = "0.11"
 evalexpr = "11.3"
 exr = "1.72"
-fast_image_resize = "5.0"
+fast_image_resize = { version = "5.0", features = ["rayon"] }
 gif = "0.13.1"
 gif-dispose = "5.0.1"
 image = { version = "0.25.4", features = ["hdr"] }
@@ -39,6 +39,7 @@ notan = { version = "0.12", default-features = false, features = [
     "draw",
     "drop_files",
     "egui",
+    "clipboard"
 ] }
 egui_plot = "0.27"
 palette = "0.7"
@@ -93,6 +94,7 @@ libblur = "0.13.5"
 egui-modal = "0.3.6"
 zip = "2.2.0"
 ase-swatch = "0.1.0"
+quantette = { version = "0.3.0", features = ["threads"] }
 
 [features]
 default = [
@@ -111,6 +113,7 @@ turbo = ["turbojpeg"]
 update = ["self_update"]
 j2k = ["jpeg2k"]
 jxlcms = ["jxl-oxide/lcms2"]
+hdr = []
 
 
 [target.'cfg(target_os = "macos")'.dependencies]

src/appstate.rs

@@ -3,11 +3,12 @@ use crate::{
     scrubber::Scrubber,
     settings::{PersistentSettings, VolatileSettings},
     texture_wrapper::TextureWrapperManager,
+    thumbnails::Thumbnails,
     utils::{ExtendedImageInfo, Frame, Player},
 };
 
 use egui_notify::Toasts;
-use image::RgbaImage;
+use image::DynamicImage;
 use nalgebra::Vector2;
 use notan::{egui::epaint::ahash::HashMap, prelude::Texture, AppState};
 use std::{
@@ -70,7 +71,7 @@ pub struct OculanteState {
     //pub current_texture: Option<TexWrap>,
     pub current_texture: TextureWrapperManager,
     pub current_path: Option<PathBuf>,
-    pub current_image: Option<RgbaImage>,
+    pub current_image: Option<DynamicImage>,
     pub settings_enabled: bool,
     pub image_info: Option<ExtendedImageInfo>,
     pub tiling: usize,
@@ -93,6 +94,7 @@ pub struct OculanteState {
     pub first_start: bool,
     pub toasts: Toasts,
     pub filebrowser_id: Option<String>,
+    pub thumbnails: Thumbnails,
 }
 
 impl<'b> OculanteState {
@@ -109,10 +111,7 @@ impl<'b> OculanteState {
     }
 
     pub fn send_frame(&self, frame: Frame) {
-        let _ = self
-        .texture_channel
-        .0
-        .send(frame);
+        let _ = self.texture_channel.0.send(frame);
     }
 }
 
@@ -161,6 +160,7 @@ impl<'b> Default for OculanteState {
             first_start: true,
             toasts: Toasts::default().with_anchor(egui_notify::Anchor::BottomLeft),
             filebrowser_id: None,
+            thumbnails: Default::default(),
         }
     }
 }

src/cache.rs

@@ -4,31 +4,31 @@ use std::{
     time::Instant,
 };
 
-use image::RgbaImage;
+use image::DynamicImage;
 use log::debug;
 
-#[derive(Debug)]
+#[derive(Debug, Default)]
 pub struct Cache {
     pub data: HashMap<PathBuf, CachedImage>,
     pub cache_size: usize,
 }
 
 #[derive(Debug)]
 pub struct CachedImage {
-    data: RgbaImage,
+    data: DynamicImage,
     created: Instant,
 }
 
 impl Cache {
-    pub fn get(&self, path: &Path) -> Option<RgbaImage> {
+    pub fn get(&self, path: &Path) -> Option<DynamicImage> {
         self.data.get(path).map(|c| c.data.clone())
     }
 
     pub fn clear(&mut self) {
         self.data.clear()
     }
 
-    pub fn insert(&mut self, path: &Path, img: RgbaImage) {
+    pub fn insert(&mut self, path: &Path, img: DynamicImage) {
         self.data.insert(
             path.into(),
             CachedImage {

src/file_encoder.rs

@@ -6,10 +6,11 @@ use crate::ui::EguiExt;
 use anyhow::Result;
 use image::codecs::jpeg::JpegEncoder;
 use image::codecs::png::{CompressionType, PngEncoder};
-use image::DynamicImage;
+use image::{DynamicImage, ImageEncoder};
 use notan::egui::Ui;
 use serde::{Deserialize, Serialize};
 use std::fs::File;
+use std::io::BufWriter;
 use std::path::Path;
 use strum::{Display, EnumIter};
 
@@ -69,18 +70,23 @@ impl FileEncoder {
                 JpegEncoder::new_with_quality(w, *quality as u8).encode_image(image)?;
             }
             FileEncoder::Png { compressionlevel } => {
-                let w = File::create(path)?;
-
-                PngEncoder::new_with_quality(
-                    w,
+                let file = File::create(path)?;
+                let writer = BufWriter::new(file);
+                let encoder = PngEncoder::new_with_quality(
+                    writer,
                     match compressionlevel {
                         CompressionLevel::Best => CompressionType::Best,
                         CompressionLevel::Default => CompressionType::Default,
                         CompressionLevel::Fast => CompressionType::Fast,
                     },
-                    image::codecs::png::FilterType::Adaptive,
+                    image::codecs::png::FilterType::default(),
                 );
-                image.save_with_format(path, image::ImageFormat::Png)?;
+                encoder.write_image(
+                    image.as_bytes(),
+                    image.width(),
+                    image.height(),
+                    image::ExtendedColorType::Rgba8,
+                )?;
             }
             FileEncoder::Bmp => {
                 image.save_with_format(path, image::ImageFormat::Bmp)?;