Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 20:50:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

Qualify stb_image::LoadResult.

Browse source
This commit is contained in:
Ms2ger 2015-01-04 11:50:36 +01:00
parent 1130c1dced
commit 3e283da8b1
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
components/net/image/base.rs
View file

@ -66,7 +66,7 @@ pub fn load_from_memory(buffer: &[u8]) -> Option<Image> {
static FORCE_DEPTH: uint = 4; static FORCE_DEPTH: uint = 4;
match stb_image::load_from_memory_with_depth(buffer, FORCE_DEPTH, true) { match stb_image::load_from_memory_with_depth(buffer, FORCE_DEPTH, true) {
stb_image::ImageU8(mut image) => { stb_image::LoadResult::ImageU8(mut image) => {
assert!(image.depth == 4); assert!(image.depth == 4);
byte_swap(image.data.as_mut_slice()); byte_swap(image.data.as_mut_slice());
Some(png::Image { Some(png::Image {
@ -75,11 +75,11 @@ pub fn load_from_memory(buffer: &[u8]) -> Option<Image> {
pixels: png::PixelsByColorType::RGBA8(image.data) pixels: png::PixelsByColorType::RGBA8(image.data)
}) })
} }
stb_image::ImageF32(_image) => { stb_image::LoadResult::ImageF32(_image) => {
error!("HDR images not implemented"); error!("HDR images not implemented");
None None
} }
stb_image::Error(e) => { stb_image::LoadResult::Error(e) => {
error!("stb_image failed: {}", e); error!("stb_image failed: {}", e);
None None
} }