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

Rustfmt net_traits.

Browse source
This commit is contained in:
Ms2ger 2017-01-03 14:31:48 +01:00
parent b76613a389
commit b46846e2a0
9 changed files with 151 additions and 120 deletions
Download patch file Download diff file Expand all files Collapse all files

33
components/net_traits/image/base.rs
View file

@ -63,13 +63,13 @@ pub fn load_from_memory(buffer: &[u8]) -> Option<Image> {
Err(msg) => {
debug!("{}", msg);
None
}
},
Ok(_) => {
match piston_image::load_from_memory(buffer) {
Ok(image) => {
let mut rgba = match image {
DynamicImage::ImageRgba8(rgba) => rgba,
image => image.to_rgba()
image => image.to_rgba(),
};
byte_swap_and_premultiply(&mut *rgba);
Some(Image {
@ -79,31 +79,38 @@ pub fn load_from_memory(buffer: &[u8]) -> Option<Image> {
bytes: IpcSharedMemory::from_bytes(&*rgba),
id: None,
})
}
},
Err(e) => {
debug!("Image decoding error: {:?}", e);
None
}
},
}
}
},
}
}
// https://developer.mozilla.org/en-US/docs/Web/HTML/Element/img
pub fn detect_image_format(buffer: &[u8]) -> Result<ImageFormat, &str> {
if is_gif(buffer) { Ok(ImageFormat::GIF)
} else if is_jpeg(buffer) { Ok(ImageFormat::JPEG)
} else if is_png(buffer) { Ok(ImageFormat::PNG)
} else if is_bmp(buffer) { Ok(ImageFormat::BMP)
} else if is_ico(buffer) { Ok(ImageFormat::ICO)
} else { Err("Image Format Not Supported") }
if is_gif(buffer) {
Ok(ImageFormat::GIF)
} else if is_jpeg(buffer) {
Ok(ImageFormat::JPEG)
} else if is_png(buffer) {
Ok(ImageFormat::PNG)
} else if is_bmp(buffer) {
Ok(ImageFormat::BMP)
} else if is_ico(buffer) {
Ok(ImageFormat::ICO)
} else {
Err("Image Format Not Supported")
}
}
fn is_gif(buffer: &[u8]) -> bool {
match buffer {
&[b'G', b'I', b'F', b'8', n, b'a', ..] if n == b'7' || n == b'9' => true,
_ => false
&[b'G', b'I', b'F', b'8', n, b'a', _..] if n == b'7' || n == b'9' => true,
_ => false,
}
}