diff --git a/services/gam/src/bitmap.rs b/services/gam/src/bitmap.rs index c71b5104b..a4cb16fb1 100644 --- a/services/gam/src/bitmap.rs +++ b/services/gam/src/bitmap.rs @@ -7,6 +7,8 @@ use std::ops::Deref; mod decode_png; pub use decode_png::*; +mod greyscale; +pub use greyscale::*; mod shrink; pub use shrink::*; mod dither; @@ -425,119 +427,6 @@ impl Deref for Img { } } -// ********************************************************************** - -pub struct GreyScale { - iter: I, - px_type: PixelType, -} - -impl> GreyScale { - fn new(iter: I, px_type: PixelType) -> GreyScale { - Self { iter, px_type } - } -} - -impl> Iterator for GreyScale { - type Item = u8; - - fn next(&mut self) -> Option { - match self.px_type { - PixelType::U8 => match self.iter.next() { - Some(gr) => Some(gr), - None => None, - }, - PixelType::U8x2 => match self.iter.next() { - Some(gr) => { - let _alpha = self.iter.next(); - Some(gr) - } - None => None, - }, - PixelType::U8x3 => { - let r = self.iter.next(); - let g = self.iter.next(); - let b = self.iter.next(); - grey(r, g, b) - } - PixelType::U8x4 => { - let r = self.iter.next(); - let g = self.iter.next(); - let b = self.iter.next(); - let _alpha = self.iter.next(); - grey(r, g, b) - } - PixelType::U16 => match self.iter.next() { - Some(gr) => { - let _lower_bits = self.iter.next(); - Some(gr) - } - None => None, - }, - PixelType::U16x2 => match self.iter.next() { - Some(gr) => { - let _lower_bits = self.iter.next(); - let _alpha = self.iter.next(); - let _alpha = self.iter.next(); - Some(gr) - } - None => None, - }, - PixelType::U16x3 => { - let r = self.iter.next(); - let _lower_bits = self.iter.next(); - let g = self.iter.next(); - let _lower_bits = self.iter.next(); - let b = self.iter.next(); - let _lower_bits = self.iter.next(); - grey(r, g, b) - } - PixelType::U16x4 => { - let r = self.iter.next(); - let _lower_bits = self.iter.next(); - let g = self.iter.next(); - let _lower_bits = self.iter.next(); - let b = self.iter.next(); - let _lower_bits = self.iter.next(); - let _alpha = self.iter.next(); - let _lower_bits = self.iter.next(); - grey(r, g, b) - } - _ => { - log::warn!("unsupported PixelType {:?}", self.px_type); - None - } - } - } -} - - -// chromatic coversion from RGB to Greyscale -fn grey(r: Option, g: Option, b: Option) -> Option { - const R: u32 = 2126; - const G: u32 = 7152; - const B: u32 = 722; - const BLACK: u32 = R + G + B; - if r.is_some() && g.is_some() && b.is_some() { - let grey_r = R * r.unwrap() as u32; - let grey_g = G * g.unwrap() as u32; - let grey_b = B * b.unwrap() as u32; - let grey: u8 = ((grey_r + grey_g + grey_b) / BLACK).try_into().unwrap(); - Some(grey) - } else { - None - } -} - -pub trait GreyScaleIterator: Iterator + Sized { - /// converts pixels of PixelType to u8 greyscale - fn to_grey(self, px_type: PixelType) -> GreyScale { - GreyScale::new(self, px_type) - } -} - -impl> GreyScaleIterator for I {} - // ********************************************************************** diff --git a/services/gam/src/bitmap/greyscale.rs b/services/gam/src/bitmap/greyscale.rs new file mode 100644 index 000000000..505ff19b5 --- /dev/null +++ b/services/gam/src/bitmap/greyscale.rs @@ -0,0 +1,118 @@ +/* + * GreyScale is an adaptor Iterator to convert RGB bytes to a greyscale byte + * + * author: nworbnhoj + */ + +use crate::PixelType; +use std::convert::TryInto; + +pub struct GreyScale { + iter: I, + px_type: PixelType, +} + +impl> GreyScale { + fn new(iter: I, px_type: PixelType) -> GreyScale { + Self { iter, px_type } + } +} + +impl> Iterator for GreyScale { + type Item = u8; + + fn next(&mut self) -> Option { + match self.px_type { + PixelType::U8 => match self.iter.next() { + Some(gr) => Some(gr), + None => None, + }, + PixelType::U8x2 => match self.iter.next() { + Some(gr) => { + let _alpha = self.iter.next(); + Some(gr) + } + None => None, + }, + PixelType::U8x3 => { + let r = self.iter.next(); + let g = self.iter.next(); + let b = self.iter.next(); + grey(r, g, b) + } + PixelType::U8x4 => { + let r = self.iter.next(); + let g = self.iter.next(); + let b = self.iter.next(); + let _alpha = self.iter.next(); + grey(r, g, b) + } + PixelType::U16 => match self.iter.next() { + Some(gr) => { + let _lower_bits = self.iter.next(); + Some(gr) + } + None => None, + }, + PixelType::U16x2 => match self.iter.next() { + Some(gr) => { + let _lower_bits = self.iter.next(); + let _alpha = self.iter.next(); + let _alpha = self.iter.next(); + Some(gr) + } + None => None, + }, + PixelType::U16x3 => { + let r = self.iter.next(); + let _lower_bits = self.iter.next(); + let g = self.iter.next(); + let _lower_bits = self.iter.next(); + let b = self.iter.next(); + let _lower_bits = self.iter.next(); + grey(r, g, b) + } + PixelType::U16x4 => { + let r = self.iter.next(); + let _lower_bits = self.iter.next(); + let g = self.iter.next(); + let _lower_bits = self.iter.next(); + let b = self.iter.next(); + let _lower_bits = self.iter.next(); + let _alpha = self.iter.next(); + let _lower_bits = self.iter.next(); + grey(r, g, b) + } + _ => { + log::warn!("unsupported PixelType {:?}", self.px_type); + None + } + } + } +} + +// chromatic coversion from RGB to Greyscale +fn grey(r: Option, g: Option, b: Option) -> Option { + const R: u32 = 2126; + const G: u32 = 7152; + const B: u32 = 722; + const BLACK: u32 = R + G + B; + if r.is_some() && g.is_some() && b.is_some() { + let grey_r = R * r.unwrap() as u32; + let grey_g = G * g.unwrap() as u32; + let grey_b = B * b.unwrap() as u32; + let grey: u8 = ((grey_r + grey_g + grey_b) / BLACK).try_into().unwrap(); + Some(grey) + } else { + None + } +} + +pub trait GreyScaleIterator: Iterator + Sized { + /// converts pixels of PixelType to u8 greyscale + fn to_grey(self, px_type: PixelType) -> GreyScale { + GreyScale::new(self, px_type) + } +} + +impl> GreyScaleIterator for I {}