me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix import consistency for bytemuck

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2023-07-12 09:03:24 +02:00
parent af386fd0a3
commit 9f73ee3206
No known key found for this signature in database
GPG key ID: 140CC052C94F138E
3 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
tiny_skia/src/raster.rs
View file

@ -2,7 +2,6 @@ use crate::core::image as raster;
use crate::core::{Rectangle, Size}; use crate::core::{Rectangle, Size};
use crate::graphics; use crate::graphics;
use bytemuck::cast;
use rustc_hash::{FxHashMap, FxHashSet}; use rustc_hash::{FxHashMap, FxHashSet};
use std::cell::RefCell; use std::cell::RefCell;
use std::collections::hash_map; use std::collections::hash_map;
@ -81,8 +80,9 @@ impl Cache {
for (i, pixel) in image.pixels().enumerate() { for (i, pixel) in image.pixels().enumerate() {
let [r, g, b, a] = pixel.0; let [r, g, b, a] = pixel.0;
buffer[i] = cast(tiny_skia::ColorU8::from_rgba(b, g, r, a) buffer[i] = bytemuck::cast(
.premultiply()); tiny_skia::ColorU8::from_rgba(b, g, r, a).premultiply(),
);
} }
entry.insert(Some(Entry { entry.insert(Some(Entry {

5
tiny_skia/src/text.rs
View file

@ -3,7 +3,6 @@ use crate::core::font::{self, Font};
use crate::core::text::{Hit, LineHeight, Shaping}; use crate::core::text::{Hit, LineHeight, Shaping};
use crate::core::{Color, Pixels, Point, Rectangle, Size}; use crate::core::{Color, Pixels, Point, Rectangle, Size};
use bytemuck::cast;
use rustc_hash::{FxHashMap, FxHashSet}; use rustc_hash::{FxHashMap, FxHashSet};
use std::borrow::Cow; use std::borrow::Cow;
use std::cell::RefCell; use std::cell::RefCell;
@ -289,7 +288,7 @@ impl GlyphCache {
for _y in 0..image.placement.height { for _y in 0..image.placement.height {
for _x in 0..image.placement.width { for _x in 0..image.placement.width {
buffer[i] = cast( buffer[i] = bytemuck::cast(
tiny_skia::ColorU8::from_rgba( tiny_skia::ColorU8::from_rgba(
b, b,
g, g,
@ -309,7 +308,7 @@ impl GlyphCache {
for _y in 0..image.placement.height { for _y in 0..image.placement.height {
for _x in 0..image.placement.width { for _x in 0..image.placement.width {
// TODO: Blend alpha // TODO: Blend alpha
buffer[i >> 2] = cast( buffer[i >> 2] = bytemuck::cast(
tiny_skia::ColorU8::from_rgba( tiny_skia::ColorU8::from_rgba(
image.data[i + 2], image.data[i + 2],
image.data[i + 1], image.data[i + 1],

3
tiny_skia/src/vector.rs
View file

@ -1,7 +1,6 @@
use crate::core::svg::{Data, Handle}; use crate::core::svg::{Data, Handle};
use crate::core::{Color, Rectangle, Size}; use crate::core::{Color, Rectangle, Size};
use bytemuck::cast;
use resvg::usvg; use resvg::usvg;
use rustc_hash::{FxHashMap, FxHashSet}; use rustc_hash::{FxHashMap, FxHashSet};
@ -157,7 +156,7 @@ impl Cache {
for pixel in for pixel in
bytemuck::cast_slice_mut::<u8, u32>(image.data_mut()) bytemuck::cast_slice_mut::<u8, u32>(image.data_mut())
{ {
*pixel = cast( *pixel = bytemuck::cast(
tiny_skia::ColorU8::from_rgba( tiny_skia::ColorU8::from_rgba(
b, b,
g, g,