Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'tygyh/Resolve-all-'#-allow(clippy--manual_saturating_arithmetic)]'-error-supressions' into 'master'

Browse Source 
Resolve all '#[allow(clippy::manual_saturating_arithmetic)]' error supressions

See merge request veloren/veloren!3038
This commit is contained in:
Imbris 2021-11-30 20:41:39 +00:00
commit dde1bacad7
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
voxygen/src/ui/graphic/pixel_art.rs
View File

@ -34,7 +34,6 @@ const EPSILON: f32 = 0.0001;
// we can now calculate the combined alpha value // we can now calculate the combined alpha value
// and E6 can then be solved for c3 // and E6 can then be solved for c3
// E9: c3 = (A1 * c1 * a1 + A2 * c2 * a2) / a3 // E9: c3 = (A1 * c1 * a1 + A2 * c2 * a2) / a3
#[allow(clippy::manual_saturating_arithmetic)] // TODO: Pending review in #587
pub fn resize_pixel_art(image: &RgbaImage, new_width: u32, new_height: u32) -> RgbaImage { pub fn resize_pixel_art(image: &RgbaImage, new_width: u32, new_height: u32) -> RgbaImage {
span!(_guard, "resize_pixel_art"); span!(_guard, "resize_pixel_art");
let (width, height) = image.dimensions(); let (width, height) = image.dimensions();
@ -52,9 +51,7 @@ pub fn resize_pixel_art(image: &RgbaImage, new_width: u32, new_height: u32) -> R
let xsmax = (xsmin + wratio).min(width as f32); let xsmax = (xsmin + wratio).min(width as f32);
// Min and max pixels covered // Min and max pixels covered
let xminp = xsmin.floor() as u32; let xminp = xsmin.floor() as u32;
let xmaxp = ((xsmax - EPSILON).ceil() as u32) let xmaxp = ((xsmax - EPSILON).ceil() as u32).saturating_sub(1);
.checked_sub(1)
.unwrap_or(0);
// Fraction of first pixel to use // Fraction of first pixel to use
let first_x_frac = if xminp != xmaxp { let first_x_frac = if xminp != xmaxp {
1.0 - xsmin.fract() 1.0 - xsmin.fract()
@ -68,9 +65,7 @@ pub fn resize_pixel_art(image: &RgbaImage, new_width: u32, new_height: u32) -> R
let ysmax = (ysmin + hratio).min(height as f32); let ysmax = (ysmin + hratio).min(height as f32);
// Min and max of pixels covered // Min and max of pixels covered
let yminp = ysmin.floor() as u32; let yminp = ysmin.floor() as u32;
let ymaxp = ((ysmax - EPSILON).ceil() as u32) let ymaxp = ((ysmax - EPSILON).ceil() as u32).saturating_sub(1);
.checked_sub(1)
.unwrap_or(0);
// Fraction of first pixel to use // Fraction of first pixel to use
let first_y_frac = if yminp != ymaxp { let first_y_frac = if yminp != ymaxp {
1.0 - ysmin.fract() 1.0 - ysmin.fract()