From 2c7c42ee93a61f39562590f6a75eb2dd8b220fb8 Mon Sep 17 00:00:00 2001
From: Ian Douglas Scott <idscott@system76.com>
Date: Mon, 31 Oct 2022 13:37:56 -0700
Subject: Move image/svg handling into `iced_graphics`

The `TextureStore` trait is implemented by the atlas, and can also be
implemented in the glow renderer or in a software renderer.

The API here may be improved in the future, but API stability is
presumably not a huge issue since these types will only be used by
renderer backends.
---
 graphics/src/image.rs | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 graphics/src/image.rs

(limited to 'graphics/src/image.rs')

diff --git a/graphics/src/image.rs b/graphics/src/image.rs
new file mode 100644
index 00000000..f1153882
--- /dev/null
+++ b/graphics/src/image.rs
@@ -0,0 +1,34 @@
+//! Image loading and caching
+
+use std::fmt::Debug;
+
+#[cfg(feature = "image_rs")]
+pub mod raster;
+
+#[cfg(feature = "svg")]
+pub mod vector;
+
+/// Entry in the texture store
+pub trait TextureStoreEntry: Debug {
+    /// Width and height of the entry
+    fn size(&self) -> (u32, u32);
+}
+
+/// Stores cached image data for use in rendering
+pub trait TextureStore {
+    /// Entry in the texture store
+    type Entry: TextureStoreEntry;
+    /// State passed to upload/remove
+    type State<'a>;
+
+    /// Upload image data
+    fn upload(
+        &mut self,
+        width: u32,
+        height: u32,
+        data: &[u8],
+        state: &mut Self::State<'_>,
+    ) -> Option<Self::Entry>;
+    /// Remome image from store
+    fn remove(&mut self, entry: &Self::Entry, state: &mut Self::State<'_>);
+}
-- 
cgit 


From 8ce8d374b1e8d1d394a42a5ee2bca8af790f0b71 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Sat, 5 Nov 2022 03:13:04 +0100
Subject: Refactor some `image` traits a bit

- Use `Size<u32>` were applicable.
- Rename `TextureStore` to `image::Storage`.
- Rename `TextureStoreEntry` to `image::storage::Entry`.
- Wire up `viewport_dimensions` to `iced_glow` for `Svg`.
---
 graphics/src/image.rs | 30 +++---------------------------
 1 file changed, 3 insertions(+), 27 deletions(-)

(limited to 'graphics/src/image.rs')

diff --git a/graphics/src/image.rs b/graphics/src/image.rs
index f1153882..04f4ff9d 100644
--- a/graphics/src/image.rs
+++ b/graphics/src/image.rs
@@ -1,34 +1,10 @@
-//! Image loading and caching
-
-use std::fmt::Debug;
-
+//! Render images.
 #[cfg(feature = "image_rs")]
 pub mod raster;
 
 #[cfg(feature = "svg")]
 pub mod vector;
 
-/// Entry in the texture store
-pub trait TextureStoreEntry: Debug {
-    /// Width and height of the entry
-    fn size(&self) -> (u32, u32);
-}
-
-/// Stores cached image data for use in rendering
-pub trait TextureStore {
-    /// Entry in the texture store
-    type Entry: TextureStoreEntry;
-    /// State passed to upload/remove
-    type State<'a>;
+pub mod storage;
 
-    /// Upload image data
-    fn upload(
-        &mut self,
-        width: u32,
-        height: u32,
-        data: &[u8],
-        state: &mut Self::State<'_>,
-    ) -> Option<Self::Entry>;
-    /// Remome image from store
-    fn remove(&mut self, entry: &Self::Entry, state: &mut Self::State<'_>);
-}
+pub use storage::Storage;
-- 
cgit