mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-18 08:52:45 +00:00
reduce memory footprint of Dither::dither()
This commit is contained in:
parent
2dbdb10704
commit
5c48439a66
1 changed files with 21 additions and 20 deletions
|
|
@ -20,7 +20,7 @@ use std::ops::Deref;
|
||||||
* author: nworbnhoj
|
* author: nworbnhoj
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#[derive(Debug, Clone)]
|
#[derive(Debug)]
|
||||||
pub struct Bitmap {
|
pub struct Bitmap {
|
||||||
pub bound: Rectangle,
|
pub bound: Rectangle,
|
||||||
tile_size: Point,
|
tile_size: Point,
|
||||||
|
|
@ -251,8 +251,8 @@ impl From<&Img> for Bitmap {
|
||||||
};
|
};
|
||||||
let mut mosaic: Vec<Tile> = Vec::new();
|
let mut mosaic: Vec<Tile> = Vec::new();
|
||||||
|
|
||||||
let pixels = Dither::new(BURKES.to_vec()).dither(&image);
|
let words = Dither::new(BURKES.to_vec()).dither(&image);
|
||||||
let mut px_index = 0;
|
let mut wd_index = 0;
|
||||||
let bits_per_word: i16 = BITS_PER_WORD.try_into().unwrap();
|
let bits_per_word: i16 = BITS_PER_WORD.try_into().unwrap();
|
||||||
for t in 0..tile_count {
|
for t in 0..tile_count {
|
||||||
let t_top = t * tile_height;
|
let t_top = t * tile_height;
|
||||||
|
|
@ -266,15 +266,8 @@ impl From<&Img> for Bitmap {
|
||||||
for y in t_top..=t_bottom {
|
for y in t_top..=t_bottom {
|
||||||
let mut x = t_left;
|
let mut x = t_left;
|
||||||
while x <= t_right {
|
while x <= t_right {
|
||||||
let mut word: usize = 0;
|
let word = words[wd_index];
|
||||||
for w in 0..bits_per_word {
|
wd_index += 1;
|
||||||
if (x + w) > t_right {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
let color = pixels[px_index] as usize;
|
|
||||||
word = word | (color << w);
|
|
||||||
px_index += 1;
|
|
||||||
}
|
|
||||||
let anchor = Point::new(x.try_into().unwrap(), y.try_into().unwrap());
|
let anchor = Point::new(x.try_into().unwrap(), y.try_into().unwrap());
|
||||||
tile.set_word(anchor, word.try_into().unwrap());
|
tile.set_word(anchor, word.try_into().unwrap());
|
||||||
x += bits_per_word;
|
x += bits_per_word;
|
||||||
|
|
@ -302,7 +295,7 @@ pub enum PixelType {
|
||||||
* author: nworbnhoj
|
* author: nworbnhoj
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#[derive(Debug, Clone)]
|
#[derive(Debug)]
|
||||||
pub struct Img {
|
pub struct Img {
|
||||||
pixels: Vec<u8>,
|
pixels: Vec<u8>,
|
||||||
width: usize,
|
width: usize,
|
||||||
|
|
@ -476,21 +469,29 @@ impl Dither {
|
||||||
PixelColor::Light
|
PixelColor::Light
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
pub fn dither(&mut self, image: &Img) -> Vec<PixelColor> {
|
pub fn dither(&mut self, image: &Img) -> Vec<Word> {
|
||||||
let (width, height, length) = image.size();
|
let bits_per_word: u32 = BITS_PER_WORD.try_into().unwrap();
|
||||||
|
let (width, height, _) = image.size();
|
||||||
self.provision(width.try_into().unwrap());
|
self.provision(width.try_into().unwrap());
|
||||||
let mut pixels: Vec<PixelColor> = Vec::with_capacity(length);
|
let mut words: Vec<Word> = Vec::with_capacity((1 + width / BITS_PER_WORD) * height);
|
||||||
for y in 0..height {
|
for y in 0..height {
|
||||||
|
let (mut w, mut word): (Word, Word) = (0, 0);
|
||||||
for x in 0..width {
|
for x in 0..width {
|
||||||
let pixel = match image.get(x, y) {
|
let color = match image.get(x, y) {
|
||||||
Some(grey) => self.pixel(*grey),
|
Some(grey) => self.pixel(*grey),
|
||||||
None => PixelColor::Dark,
|
None => PixelColor::Dark,
|
||||||
};
|
};
|
||||||
pixels.push(pixel);
|
word = word | ((color as u32) << w);
|
||||||
|
w += 1;
|
||||||
|
if w >= bits_per_word {
|
||||||
|
words.push(word);
|
||||||
|
(w, word) = (0, 0);
|
||||||
|
}
|
||||||
self.next();
|
self.next();
|
||||||
}
|
}
|
||||||
|
words.push(word);
|
||||||
}
|
}
|
||||||
pixels
|
words
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue