Merge pull request #211 from mrkgnao/master

Add support for loading already-decoded image pixels

2 files changed, 43 insertions, 0 deletions

diff --git a/native/src/widget/image.rs b/native/src/widget/image.rs
index 9b92c7f1..fbe38bfc 100644
--- a/native/src/widget/image.rs
+++ b/native/src/widget/image.rs
@@ -125,6 +125,21 @@ impl Handle {
         Self::from_data(Data::Path(path.into()))
     }
 
+    /// Creates an image [`Handle`] containing the image pixels directly. This
+    /// function expects the input data to be provided as a `Vec<u8>` of BGRA 
+    /// pixels.
+    ///
+    /// This is useful if you have already decoded your image.
+    ///
+    /// [`Handle`]: struct.Handle.html
+    pub fn from_pixels(width: u32, height: u32, pixels: Vec<u8>) -> Handle {
+        Self::from_data(Data::Pixels {
+            width,
+            height,
+            pixels,
+        })
+    }
+
     /// Creates an image [`Handle`] containing the image data directly.
     ///
     /// This is useful if you already have your image loaded in-memory, maybe
@@ -188,6 +203,16 @@ pub enum Data {
 
     /// In-memory data
     Bytes(Vec<u8>),
+
+    /// Decoded image pixels in BGRA format.
+    Pixels {
+        /// The width of the image.
+        width: u32,
+        /// The height of the image.
+        height: u32,
+        /// The pixels.
+        pixels: Vec<u8>,
+    },
 }
 
 impl std::fmt::Debug for Data {
@@ -195,6 +220,9 @@ impl std::fmt::Debug for Data {
         match self {
             Data::Path(path) => write!(f, "Path({:?})", path),
             Data::Bytes(_) => write!(f, "Bytes(...)"),
+            Data::Pixels { width, height, .. } => {
+                write!(f, "Pixels({} * {})", width, height)
+            }
         }
     }
 }
diff --git a/wgpu/src/image/raster.rs b/wgpu/src/image/raster.rs
index 3edec57e..4f69df8c 100644
--- a/wgpu/src/image/raster.rs
+++ b/wgpu/src/image/raster.rs
@@ -55,6 +55,21 @@ impl Cache {
                     Memory::Invalid
                 }
             }
+            image::Data::Pixels {
+                width,
+                height,
+                pixels,
+            } => {
+                if let Some(image) = ::image::ImageBuffer::from_vec(
+                    *width,
+                    *height,
+                    pixels.to_vec(),
+                ) {
+                    Memory::Host(image)
+                } else {
+                    Memory::Invalid
+                }
+            }
         };
 
         self.insert(handle, memory);