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

Fix warnings: use clone_from_slice instead of copy_memory

Browse source
This commit is contained in:
Tetsuharu OHZEKI 2015-12-11 10:18:01 -05:00
parent bccb46c70a
commit 7267163f49
4 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
components/canvas/lib.rs
View file

@ -2,6 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#![feature(clone_from_slice)]
#![feature(nonzero)] #![feature(nonzero)]
#![feature(slice_bytes)] #![feature(slice_bytes)]
#![feature(plugin)] #![feature(plugin)]

3
components/canvas/webgl_paint_task.rs
View file

@ -13,7 +13,6 @@ use ipc_channel::router::ROUTER;
use layers::platform::surface::NativeSurface; use layers::platform::surface::NativeSurface;
use offscreen_gl_context::{ColorAttachmentType, GLContext, GLContextAttributes}; use offscreen_gl_context::{ColorAttachmentType, GLContext, GLContextAttributes};
use std::borrow::ToOwned; use std::borrow::ToOwned;
use std::slice::bytes::copy_memory;
use std::sync::mpsc::{Sender, channel}; use std::sync::mpsc::{Sender, channel};
use util::task::spawn_named; use util::task::spawn_named;
use util::vec::byte_swap; use util::vec::byte_swap;
@ -365,7 +364,7 @@ impl WebGLPaintTask {
let dst_start = y * stride; let dst_start = y * stride;
let src_start = (height - y - 1) * stride; let src_start = (height - y - 1) * stride;
let src_slice = &orig_pixels[src_start .. src_start + stride]; let src_slice = &orig_pixels[src_start .. src_start + stride];
copy_memory(&src_slice[..stride], &mut pixels[dst_start .. dst_start + stride]); (&mut pixels[dst_start .. dst_start + stride]).clone_from_slice(&src_slice[..stride]);
} }
// rgba -> bgra // rgba -> bgra

4
components/compositing/compositor.rs
View file

@ -44,7 +44,6 @@ use std::collections::{HashMap, HashSet};
use std::fs::File; use std::fs::File;
use std::mem as std_mem; use std::mem as std_mem;
use std::rc::Rc; use std::rc::Rc;
use std::slice::bytes::copy_memory;
use std::sync::mpsc::Sender; use std::sync::mpsc::Sender;
use style_traits::viewport::ViewportConstraints; use style_traits::viewport::ViewportConstraints;
use surface_map::SurfaceMap; use surface_map::SurfaceMap;
@ -1913,8 +1912,7 @@ impl<Window: WindowMethods> IOCompositor<Window> {
let dst_start = y * stride; let dst_start = y * stride;
let src_start = (height - y - 1) * stride; let src_start = (height - y - 1) * stride;
let src_slice = &orig_pixels[src_start .. src_start + stride]; let src_slice = &orig_pixels[src_start .. src_start + stride];
copy_memory(&src_slice[..stride], (&mut pixels[dst_start .. dst_start + stride]).clone_from_slice(&src_slice[..stride]);
&mut pixels[dst_start .. dst_start + stride]);
} }
RgbImage::from_raw(width as u32, height as u32, pixels).unwrap() RgbImage::from_raw(width as u32, height as u32, pixels).unwrap()
} }

1
components/compositing/lib.rs
View file

@ -3,6 +3,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#![feature(box_syntax)] #![feature(box_syntax)]
#![feature(clone_from_slice)]
#![feature(custom_derive)] #![feature(custom_derive)]
#![feature(plugin)] #![feature(plugin)]
#![feature(slice_bytes)] #![feature(slice_bytes)]