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

Fix deprecation warnings.

Browse source
This commit is contained in:
Josh Matthews 2020-10-23 13:34:54 -04:00
parent 4750e68382
commit 1e3d72dc82
3 changed files with 26 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

22
components/canvas/webgl_thread.rs
View file

@ -2873,16 +2873,16 @@ fn image_to_tex_image_data(
let mut rgbaf16 = Vec::<u8>::with_capacity(pixel_count * 8);
for rgba8 in pixels.chunks(4) {
rgbaf16
.write_u16::<NativeEndian>(f16::from_f32(rgba8[0] as f32).as_bits())
.write_u16::<NativeEndian>(f16::from_f32(rgba8[0] as f32).to_bits())
.unwrap();
rgbaf16
.write_u16::<NativeEndian>(f16::from_f32(rgba8[1] as f32).as_bits())
.write_u16::<NativeEndian>(f16::from_f32(rgba8[1] as f32).to_bits())
.unwrap();
rgbaf16
.write_u16::<NativeEndian>(f16::from_f32(rgba8[2] as f32).as_bits())
.write_u16::<NativeEndian>(f16::from_f32(rgba8[2] as f32).to_bits())
.unwrap();
rgbaf16
.write_u16::<NativeEndian>(f16::from_f32(rgba8[3] as f32).as_bits())
.write_u16::<NativeEndian>(f16::from_f32(rgba8[3] as f32).to_bits())
.unwrap();
}
rgbaf16
@ -2892,13 +2892,13 @@ fn image_to_tex_image_data(
let mut rgbf16 = Vec::<u8>::with_capacity(pixel_count * 6);
for rgba8 in pixels.chunks(4) {
rgbf16
.write_u16::<NativeEndian>(f16::from_f32(rgba8[0] as f32).as_bits())
.write_u16::<NativeEndian>(f16::from_f32(rgba8[0] as f32).to_bits())
.unwrap();
rgbf16
.write_u16::<NativeEndian>(f16::from_f32(rgba8[1] as f32).as_bits())
.write_u16::<NativeEndian>(f16::from_f32(rgba8[1] as f32).to_bits())
.unwrap();
rgbf16
.write_u16::<NativeEndian>(f16::from_f32(rgba8[2] as f32).as_bits())
.write_u16::<NativeEndian>(f16::from_f32(rgba8[2] as f32).to_bits())
.unwrap();
}
rgbf16
@ -2906,7 +2906,7 @@ fn image_to_tex_image_data(
(TexFormat::Alpha, TexDataType::HalfFloat) |
(TexFormat::Alpha16f, TexDataType::HalfFloat) => {
for i in 0..pixel_count {
let p = f16::from_f32(pixels[i * 4 + 3] as f32).as_bits();
let p = f16::from_f32(pixels[i * 4 + 3] as f32).to_bits();
NativeEndian::write_u16(&mut pixels[i * 2..i * 2 + 2], p);
}
pixels.truncate(pixel_count * 2);
@ -2915,7 +2915,7 @@ fn image_to_tex_image_data(
(TexFormat::Luminance, TexDataType::HalfFloat) |
(TexFormat::Luminance16f, TexDataType::HalfFloat) => {
for i in 0..pixel_count {
let p = f16::from_f32(pixels[i * 4] as f32).as_bits();
let p = f16::from_f32(pixels[i * 4] as f32).to_bits();
NativeEndian::write_u16(&mut pixels[i * 2..i * 2 + 2], p);
}
pixels.truncate(pixel_count * 2);
@ -2924,8 +2924,8 @@ fn image_to_tex_image_data(
(TexFormat::LuminanceAlpha, TexDataType::HalfFloat) |
(TexFormat::LuminanceAlpha16f, TexDataType::HalfFloat) => {
for rgba8 in pixels.chunks_mut(4) {
let lum = f16::from_f32(rgba8[0] as f32).as_bits();
let a = f16::from_f32(rgba8[3] as f32).as_bits();
let lum = f16::from_f32(rgba8[0] as f32).to_bits();
let a = f16::from_f32(rgba8[3] as f32).to_bits();
NativeEndian::write_u16(&mut rgba8[0..2], lum);
NativeEndian::write_u16(&mut rgba8[2..4], a);
}

4
components/script/dom/htmlcanvaselement.rs
View file

@ -37,7 +37,7 @@ use canvas_traits::webgl::{GLContextAttributes, WebGLVersion};
use dom_struct::dom_struct;
use euclid::default::{Rect, Size2D};
use html5ever::{LocalName, Prefix};
use image::png::PNGEncoder;
use image::png::PngEncoder;
use image::ColorType;
use ipc_channel::ipc::{self as ipcchan, IpcSharedMemory};
use js::error::throw_type_error;
@ -426,7 +426,7 @@ impl HTMLCanvasElementMethods for HTMLCanvasElement {
let mut png = Vec::new();
// FIXME(nox): https://github.com/image-rs/image-png/issues/86
// FIXME(nox): https://github.com/image-rs/image-png/issues/87
PNGEncoder::new(&mut png)
PngEncoder::new(&mut png)
.encode(&file, self.Width(), self.Height(), ColorType::Rgba8)
.unwrap();
let mut url = "data:image/png;base64,".to_owned();