michael/pathfinder
michael
/
pathfinder
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Auto merge of #520 - becmer:master, r=jdm 

Replace use of deprecated methods from image

None
This commit is contained in:
bors-servo 2022-08-27 00:25:27 -04:00 committed by GitHub
parent 038a3476d8 0403bc3736
commit 9e0331742d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gpu/src/lib.rs
View File

@ -130,12 +130,12 @@ pub trait Device: Sized {
let image = image::load_from_memory_with_format(&data, ImageFormat::Png).unwrap(); let image = image::load_from_memory_with_format(&data, ImageFormat::Png).unwrap();
match format { match format {
TextureFormat::R8 => { TextureFormat::R8 => {
let image = image.to_luma(); let image = image.to_luma8();
let size = vec2i(image.width() as i32, image.height() as i32); let size = vec2i(image.width() as i32, image.height() as i32);
self.create_texture_from_data(format, size, TextureDataRef::U8(&image)) self.create_texture_from_data(format, size, TextureDataRef::U8(&image))
} }
TextureFormat::RGBA8 => { TextureFormat::RGBA8 => {
let image = image.to_rgba(); let image = image.to_rgba8();
let size = vec2i(image.width() as i32, image.height() as i32); let size = vec2i(image.width() as i32, image.height() as i32);
self.create_texture_from_data(format, size, TextureDataRef::U8(&image)) self.create_texture_from_data(format, size, TextureDataRef::U8(&image))
} }
@ -152,13 +152,13 @@ pub trait Device: Sized {
let image = image::load_from_memory_with_format(&data, ImageFormat::Png).unwrap(); let image = image::load_from_memory_with_format(&data, ImageFormat::Png).unwrap();
match format { match format {
TextureFormat::R8 => { TextureFormat::R8 => {
let image = image.to_luma(); let image = image.to_luma8();
let size = vec2i(image.width() as i32, image.height() as i32); let size = vec2i(image.width() as i32, image.height() as i32);
let rect = RectI::new(Vector2I::default(), size); let rect = RectI::new(Vector2I::default(), size);
self.upload_to_texture(&texture, rect, TextureDataRef::U8(&image)) self.upload_to_texture(&texture, rect, TextureDataRef::U8(&image))
} }
TextureFormat::RGBA8 => { TextureFormat::RGBA8 => {
let image = image.to_rgba(); let image = image.to_rgba8();
let size = vec2i(image.width() as i32, image.height() as i32); let size = vec2i(image.width() as i32, image.height() as i32);
let rect = RectI::new(Vector2I::default(), size); let rect = RectI::new(Vector2I::default(), size);
self.upload_to_texture(&texture, rect, TextureDataRef::U8(&image)) self.upload_to_texture(&texture, rect, TextureDataRef::U8(&image))