Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,7 @@ embedded-graphics = "0.8.0"
clap = { version = "3.1.6", features = ["derive"] }
criterion = "0.3.5"
embedded-graphics-simulator = { version = "0.5.0", default-features = false }

[patch.crates-io]
embedded-graphics = { git = "https://github.com/embedded-graphics/embedded-graphics.git" }
embedded-graphics-simulator = { git = "https://github.com/embedded-graphics/simulator.git" }
14 changes: 7 additions & 7 deletions src/raw_bmp.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use embedded_graphics::{
geometry::Point,
iterator::raw::RawDataSlice,
pixelcolor::raw::{LittleEndian, RawU1, RawU16, RawU24, RawU32, RawU4, RawU8},
pixelcolor::raw::{LittleEndianMsb0, RawU1, RawU16, RawU24, RawU32, RawU4, RawU8},
prelude::RawData,
};

Expand Down Expand Up @@ -137,27 +137,27 @@ impl<'a> RawBmp<'a> {
}?;

match self.header.bpp {
Bpp::Bits1 => RawDataSlice::<RawU1, LittleEndian>::new(row)
Bpp::Bits1 => RawDataSlice::<RawU1, LittleEndianMsb0>::new(row)
.into_iter()
.nth(p.x as usize)
.map(|raw| u32::from(raw.into_inner())),
Bpp::Bits4 => RawDataSlice::<RawU4, LittleEndian>::new(row)
Bpp::Bits4 => RawDataSlice::<RawU4, LittleEndianMsb0>::new(row)
.into_iter()
.nth(p.x as usize)
.map(|raw| u32::from(raw.into_inner())),
Bpp::Bits8 => RawDataSlice::<RawU8, LittleEndian>::new(row)
Bpp::Bits8 => RawDataSlice::<RawU8, LittleEndianMsb0>::new(row)
.into_iter()
.nth(p.x as usize)
.map(|raw| u32::from(raw.into_inner())),
Bpp::Bits16 => RawDataSlice::<RawU16, LittleEndian>::new(row)
Bpp::Bits16 => RawDataSlice::<RawU16, LittleEndianMsb0>::new(row)
.into_iter()
.nth(p.x as usize)
.map(|raw| u32::from(raw.into_inner())),
Bpp::Bits24 => RawDataSlice::<RawU24, LittleEndian>::new(row)
Bpp::Bits24 => RawDataSlice::<RawU24, LittleEndianMsb0>::new(row)
.into_iter()
.nth(p.x as usize)
.map(|raw| raw.into_inner()),
Bpp::Bits32 => RawDataSlice::<RawU32, LittleEndian>::new(row)
Bpp::Bits32 => RawDataSlice::<RawU32, LittleEndianMsb0>::new(row)
.into_iter()
.nth(p.x as usize)
.map(|raw| raw.into_inner()),
Expand Down
10 changes: 5 additions & 5 deletions src/raw_iter.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use core::{iter, slice};

use embedded_graphics::{
iterator::raw::RawDataSlice,
pixelcolor::raw::{LittleEndian, RawU1, RawU16, RawU24, RawU32, RawU4, RawU8},
pixelcolor::raw::{LittleEndianMsb0, RawU1, RawU16, RawU24, RawU32, RawU4, RawU8},
prelude::*,
primitives::{rectangle, Rectangle},
};
Expand All @@ -16,17 +16,17 @@ use crate::{
#[allow(missing_debug_implementations)]
pub struct RawColors<'a, R>
where
RawDataSlice<'a, R, LittleEndian>: IntoIterator<Item = R>,
RawDataSlice<'a, R, LittleEndianMsb0>: IntoIterator<Item = R>,
{
rows: slice::ChunksExact<'a, u8>,
row_order: RowOrder,
current_row: iter::Take<<RawDataSlice<'a, R, LittleEndian> as IntoIterator>::IntoIter>,
current_row: iter::Take<<RawDataSlice<'a, R, LittleEndianMsb0> as IntoIterator>::IntoIter>,
width: usize,
}

impl<'a, R> RawColors<'a, R>
where
RawDataSlice<'a, R, LittleEndian>: IntoIterator<Item = R>,
RawDataSlice<'a, R, LittleEndianMsb0>: IntoIterator<Item = R>,
{
pub(crate) fn new(raw_bmp: &'a RawBmp<'a>) -> Self {
let header = raw_bmp.header();
Expand All @@ -44,7 +44,7 @@ where

impl<'a, R> Iterator for RawColors<'a, R>
where
RawDataSlice<'a, R, LittleEndian>: IntoIterator<Item = R>,
RawDataSlice<'a, R, LittleEndianMsb0>: IntoIterator<Item = R>,
{
type Item = R;

Expand Down
6 changes: 3 additions & 3 deletions tests/logo.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use embedded_graphics::{
image::{GetPixel, Image, ImageRaw},
iterator::raw::RawDataSlice,
pixelcolor::{raw::LittleEndian, Bgr888, Rgb555, Rgb565, Rgb888},
pixelcolor::{raw::LittleEndianMsb0, Bgr888, Rgb555, Rgb565, Rgb888},
prelude::*,
};
use tinybmp::Bmp;
Expand Down Expand Up @@ -85,9 +85,9 @@ impl<C> OriginDimensions for Framebuffer<C> {
fn draw_raw<C>(data: &[u8]) -> Framebuffer<C>
where
C: PixelColor + From<C::Raw> + From<Rgb888> + std::fmt::Debug,
for<'a> RawDataSlice<'a, C::Raw, LittleEndian>: IntoIterator<Item = C::Raw>,
for<'a> RawDataSlice<'a, C::Raw, LittleEndianMsb0>: IntoIterator<Item = C::Raw>,
{
let raw = ImageRaw::<C, LittleEndian>::new(data, 240);
let raw = ImageRaw::<C, LittleEndianMsb0>::new(data, Size::new(240, 320)).unwrap();

Framebuffer::from_image(raw)
}
Expand Down