diff --git a/services/gam/src/bitmap.rs b/services/gam/src/bitmap.rs index 6dd5665c9..773e4c409 100644 --- a/services/gam/src/bitmap.rs +++ b/services/gam/src/bitmap.rs @@ -1,21 +1,3 @@ -use core::cmp::{max, min}; -use graphics_server::api::*; -use graphics_server::PixelColor; -use std::convert::TryInto; -use std::io::Read; -use std::ops::Deref; - -mod img; -pub use img::*; -mod decode_png; -pub use decode_png::*; -mod greyscale; -pub use greyscale::*; -mod shrink; -pub use shrink::*; -mod dither; -pub use dither::*; - /* * The basic idea is to define a Bitmap as a variable mosaic of Sized Tiles. * @@ -32,6 +14,25 @@ pub use dither::*; * author: nworbnhoj */ +use std::cmp::{max, min}; +use std::convert::TryInto; +use std::io::Read; +use std::ops::Deref; + +use graphics_server::api::*; +use graphics_server::PixelColor; + +mod img; +pub use img::*; +mod decode_png; +pub use decode_png::*; +mod greyscale; +pub use greyscale::*; +mod shrink; +pub use shrink::*; +mod dither; +pub use dither::*; + #[derive(Debug)] pub struct Bitmap { width: usize, @@ -364,10 +365,8 @@ impl<'a> From<&Img> for Bitmap { } } - // ********************************************************************** - #[cfg(test)] mod tests { use super::*;