diff --git a/services/modals/src/tests.rs b/services/modals/src/tests.rs index 0157d7082..d55e4266c 100644 --- a/services/modals/src/tests.rs +++ b/services/modals/src/tests.rs @@ -137,19 +137,19 @@ pub fn spawn_test() { // 5. test image - because it reads a local file, only makes sense on hosted mode /* - Note there are stack allocation challenges with crates `png_encode` and `jpg` - + Note there are stack allocation challenges with crates `png_encode` and `jpg` + png = {version = "0.17.5", optional = true} - ------------------------------------------- + ------------------------------------------- let decoder = png::Decoder::new(file); let mut reader = decoder.read_info().expect("failed to read png info"); let mut buf = vec![0; reader.output_buffer_size()]; let info = reader.next_frame(&mut buf).expect("failed to decode png"); let width: usize = info.width.try_into().unwrap(); - let img = Img::new(buf, width); - + let img = Img::new(buf, width); + jpeg-decoder = {version = "0.2.6", optional = true} - --------------------------------------------------- + --------------------------------------------------- let mut decoder = jpeg_decoder::Decoder::new(file); decoder .scale(Modals::MODAL_WIDTH as u16, Modals::MODAL_HEIGHT as u16) @@ -159,7 +159,7 @@ pub fn spawn_test() { let info = decoder.info().unwrap(); let width: usize = info.width.try_into().unwrap(); let img = Img::new(pixels, width); - */ + */ #[cfg(all( feature = "ditherpunk", not(any(target_os = "none", target_os = "xous")) @@ -177,24 +177,26 @@ pub fn spawn_test() { // https://sequelaencollection.home.blog/2d-chaotic-attractors/ fn clifford() -> Img { const SIZE: u32 = Modals::MODAL_WIDTH; - const CENTER:f32 = (SIZE/2) as f32; - const SCALE:f32 = 70.0; + const CENTER: f32 = (SIZE / 2) as f32; + const SCALE: f32 = 70.0; let mut buf = vec![255u8; (SIZE * SIZE).try_into().unwrap()]; - let (a, b, c, d) = (-2.0, -2.4,1.1, -0.9); - let (mut x,mut y):(f32, f32) = (0.0, 0.0); - for _ in 0..=10000000 { - let x1 = f32::sin(a*y) + c * f32::cos(a*x); - let y1 = f32::sin(b*x) + d*f32::cos(b*y); - (x, y) = (x1, y1); - let (a,b):(u32, u32) = ((x * SCALE + CENTER) as u32, (y * SCALE + CENTER) as u32); - let i:usize = (a + SIZE * b).try_into().unwrap(); - if buf[i] >0 { buf[i] -= 1; } + let (a, b, c, d) = (-2.0, -2.4, 1.1, -0.9); + let (mut x, mut y): (f32, f32) = (0.0, 0.0); + for _ in 0..=4000000 { + let x1 = f32::sin(a * y) + c * f32::cos(a * x); + let y1 = f32::sin(b * x) + d * f32::cos(b * y); + (x, y) = (x1, y1); + let (a, b): (u32, u32) = ((x * SCALE + CENTER) as u32, (y * SCALE + CENTER) as u32); + let i: usize = (a + SIZE * b).try_into().unwrap(); + if buf[i] > 0 { + buf[i] -= 1; + } } let mut rgb = vec![0u8; 3 * buf.len()]; - let mut i:usize = 0; + let mut i: usize = 0; while i < buf.len() { let j = 3 * i; - (rgb[j], rgb[j+1], rgb[j+2]) = (buf[i],buf[i],buf[i]); + (rgb[j], rgb[j + 1], rgb[j + 2]) = (buf[i], buf[i], buf[i]); i += 1; } Img::new(rgb, SIZE.try_into().unwrap())