Use `Bytes` as the `Container` of `ImageBuffer`

Since we don't need to mutate images once loaded,
we avoid unnecessary extra allocations.

1 files changed, 38 insertions, 53 deletions

diff --git a/core/src/image.rs b/core/src/image.rs
index 7316ede7..5b31fbcf 100644
--- a/core/src/image.rs
+++ b/core/src/image.rs
@@ -4,14 +4,27 @@ pub use bytes::Bytes;
 use crate::{Rectangle, Size};
 
 use rustc_hash::FxHasher;
-use std::hash::{Hash, Hasher as _};
+use std::hash::{Hash, Hasher};
 use std::path::PathBuf;
 
 /// A handle of some image data.
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct Handle {
-    id: u64,
-    data: Data,
+#[derive(Clone, PartialEq, Eq)]
+pub enum Handle {
+    /// File data
+    Path(PathBuf),
+
+    /// In-memory data
+    Bytes(Bytes),
+
+    /// Decoded image pixels in RGBA format.
+    Rgba {
+        /// The width of the image.
+        width: u32,
+        /// The height of the image.
+        height: u32,
+        /// The pixels.
+        pixels: Bytes,
+    },
 }
 
 impl Handle {
@@ -19,7 +32,7 @@ impl Handle {
     ///
     /// Makes an educated guess about the image format by examining the data in the file.
     pub fn from_path<T: Into<PathBuf>>(path: T) -> Handle {
-        Self::from_data(Data::Path(path.into()))
+        Self::Path(path.into())
     }
 
     /// Creates an image [`Handle`] containing the image pixels directly. This
@@ -32,11 +45,11 @@ impl Handle {
         height: u32,
         pixels: impl Into<Bytes>,
     ) -> Handle {
-        Self::from_data(Data::Rgba {
+        Self::Rgba {
             width,
             height,
             pixels: pixels.into(),
-        })
+        }
     }
 
     /// Creates an image [`Handle`] containing the image data directly.
@@ -46,27 +59,25 @@ impl Handle {
     /// This is useful if you already have your image loaded in-memory, maybe
     /// because you downloaded or generated it procedurally.
     pub fn from_memory(bytes: impl Into<Bytes>) -> Handle {
-        Self::from_data(Data::Bytes(bytes.into()))
-    }
-
-    fn from_data(data: Data) -> Handle {
-        let mut hasher = FxHasher::default();
-        data.hash(&mut hasher);
-
-        Handle {
-            id: hasher.finish(),
-            data,
-        }
+        Self::Bytes(bytes.into())
     }
 
     /// Returns the unique identifier of the [`Handle`].
     pub fn id(&self) -> u64 {
-        self.id
+        let mut hasher = FxHasher::default();
+        self.hash(&mut hasher);
+
+        hasher.finish()
     }
+}
 
-    /// Returns a reference to the image [`Data`].
-    pub fn data(&self) -> &Data {
-        &self.data
+impl Hash for Handle {
+    fn hash<H: Hasher>(&self, state: &mut H) {
+        match self {
+            Self::Path(path) => path.hash(state),
+            Self::Bytes(bytes) => bytes.as_ptr().hash(state),
+            Self::Rgba { pixels, .. } => pixels.as_ptr().hash(state),
+        }
     }
 }
 
@@ -79,38 +90,12 @@ where
     }
 }
 
-impl Hash for Handle {
-    fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
-        self.id.hash(state);
-    }
-}
-
-/// The data of a raster image.
-#[derive(Clone, PartialEq, Eq, Hash)]
-pub enum Data {
-    /// File data
-    Path(PathBuf),
-
-    /// In-memory data
-    Bytes(Bytes),
-
-    /// Decoded image pixels in RGBA format.
-    Rgba {
-        /// The width of the image.
-        width: u32,
-        /// The height of the image.
-        height: u32,
-        /// The pixels.
-        pixels: Bytes,
-    },
-}
-
-impl std::fmt::Debug for Data {
+impl std::fmt::Debug for Handle {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
-            Data::Path(path) => write!(f, "Path({path:?})"),
-            Data::Bytes(_) => write!(f, "Bytes(...)"),
-            Data::Rgba { width, height, .. } => {
+            Self::Path(path) => write!(f, "Path({path:?})"),
+            Self::Bytes(_) => write!(f, "Bytes(...)"),
+            Self::Rgba { width, height, .. } => {
                 write!(f, "Pixels({width} * {height})")
             }
         }