diff options
| author |  Héctor Ramón Jiménez <hector0193@gmail.com> | 2023-05-02 06:40:48 +0200 |
|---|---|---|
| committer | Héctor Ramón Jiménez <hector0193@gmail.com> | 2023-05-02 06:40:48 +0200 |
| commit | 8e8808f0e187ed6671441f5016f07bfcba426452 (patch) | |
| tree | bc4d2eeb57f60e654a4a8ed7c562f79ee507abab /wgpu/src/image | |
| parent | 2d7d9a130ece3fb6fa4cd52f9b32b4abd7887cf5 (diff) | |
| parent | c8952ee4a1118fe67bfdf40fc77f3ff30f5d0278 (diff) | |
| download | iced-8e8808f0e187ed6671441f5016f07bfcba426452.tar.gz iced-8e8808f0e187ed6671441f5016f07bfcba426452.tar.bz2 iced-8e8808f0e187ed6671441f5016f07bfcba426452.zip | |
Merge branch 'master' into advanced-text
Diffstat (limited to 'wgpu/src/image')
| -rw-r--r-- | wgpu/src/image/atlas.rs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/wgpu/src/image/atlas.rs b/wgpu/src/image/atlas.rs index 39b6e5d2..366fe623 100644 --- a/wgpu/src/image/atlas.rs +++ b/wgpu/src/image/atlas.rs @@ -14,8 +14,6 @@ pub const SIZE: u32 = 2048; use crate::core::Size; -use std::num::NonZeroU32; - #[derive(Debug)] pub struct Atlas { texture: wgpu::Texture, @@ -308,8 +306,8 @@ impl Atlas { data, wgpu::ImageDataLayout { offset: offset as u64, - bytes_per_row: NonZeroU32::new(4 * image_width + padding), - rows_per_image: NonZeroU32::new(image_height), + bytes_per_row: Some(4 * image_width + padding), + rows_per_image: Some(image_height), }, extent, ); |