Merge pull request #176 from vhdirk/graphics

fix build when feature graphics is not enabled

Author: caemor

src/color.rs

@@ -66,7 +66,7 @@ pub enum OctColor {
 }
 
 /// Color trait for use in `Display`s
-pub trait ColorType: PixelColor {
+pub trait ColorType {
     /// Number of bit used to represent this color type in a single buffer.
     /// To get the real number of bits per pixel you should multiply this by `BUFFER_COUNT`
     const BITS_PER_PIXEL_PER_BUFFER: usize;

src/graphics.rs

@@ -51,7 +51,7 @@ pub struct Display<
     const HEIGHT: u32,
     const BWRBIT: bool,
     const BYTECOUNT: usize,
-    COLOR: ColorType,
+    COLOR: ColorType + PixelColor,
 > {
     buffer: [u8; BYTECOUNT],
     rotation: DisplayRotation,
@@ -63,7 +63,7 @@ impl<
         const HEIGHT: u32,
         const BWRBIT: bool,
         const BYTECOUNT: usize,
-        COLOR: ColorType,
+        COLOR: ColorType + PixelColor,
     > Default for Display<WIDTH, HEIGHT, BWRBIT, BYTECOUNT, COLOR>
 {
     /// Initialize display with the color '0', which may not be the same on all device.
@@ -91,7 +91,7 @@ impl<
         const HEIGHT: u32,
         const BWRBIT: bool,
         const BYTECOUNT: usize,
-        COLOR: ColorType,
+        COLOR: ColorType + PixelColor,
     > DrawTarget for Display<WIDTH, HEIGHT, BWRBIT, BYTECOUNT, COLOR>
 {
     type Color = COLOR;
@@ -114,7 +114,7 @@ impl<
         const HEIGHT: u32,
         const BWRBIT: bool,
         const BYTECOUNT: usize,
-        COLOR: ColorType,
+        COLOR: ColorType + PixelColor,
     > OriginDimensions for Display<WIDTH, HEIGHT, BWRBIT, BYTECOUNT, COLOR>
 {
     fn size(&self) -> Size {
@@ -130,7 +130,7 @@ impl<
         const HEIGHT: u32,
         const BWRBIT: bool,
         const BYTECOUNT: usize,
-        COLOR: ColorType,
+        COLOR: ColorType + PixelColor,
     > Display<WIDTH, HEIGHT, BWRBIT, BYTECOUNT, COLOR>
 {
     /// get internal buffer to use it (to draw in epd)
@@ -182,7 +182,7 @@ impl<const WIDTH: u32, const HEIGHT: u32, const BWRBIT: bool, const BYTECOUNT: u
 /// Same as `Display`, except that its characteristics are defined at runtime.
 /// See display for documentation as everything is the same except that default
 /// is replaced by a `new` method.
-pub struct VarDisplay<'a, COLOR: ColorType> {
+pub struct VarDisplay<'a, COLOR: ColorType + PixelColor> {
     width: u32,
     height: u32,
     bwrbit: bool,
@@ -192,7 +192,7 @@ pub struct VarDisplay<'a, COLOR: ColorType> {
 }
 
 /// For use with embedded_grahics
-impl<'a, COLOR: ColorType> DrawTarget for VarDisplay<'a, COLOR> {
+impl<'a, COLOR: ColorType + PixelColor> DrawTarget for VarDisplay<'a, COLOR> {
     type Color = COLOR;
     type Error = core::convert::Infallible;
 
@@ -208,7 +208,7 @@ impl<'a, COLOR: ColorType> DrawTarget for VarDisplay<'a, COLOR> {
 }
 
 /// For use with embedded_grahics
-impl<'a, COLOR: ColorType> OriginDimensions for VarDisplay<'a, COLOR> {
+impl<'a, COLOR: ColorType + PixelColor> OriginDimensions for VarDisplay<'a, COLOR> {
     fn size(&self) -> Size {
         match self.rotation {
             DisplayRotation::Rotate0 | DisplayRotation::Rotate180 => {
@@ -228,7 +228,7 @@ pub enum VarDisplayError {
     BufferTooSmall,
 }
 
-impl<'a, COLOR: ColorType> VarDisplay<'a, COLOR> {
+impl<'a, COLOR: ColorType + PixelColor> VarDisplay<'a, COLOR> {
     /// You must allocate the buffer by yourself, it must be large enough to contain all pixels.
     ///
     /// Parameters are documented in `Display` as they are the same as the const generics there.
@@ -312,7 +312,7 @@ impl<'a> VarDisplay<'a, TriColor> {
 // It sets a specific pixel in a buffer to a given color.
 // The big number of parameters is due to the fact that it is an internal function to both
 // strctures.
-fn set_pixel<COLOR: ColorType>(
+fn set_pixel<COLOR: ColorType + PixelColor>(
     buffer: &mut [u8],
     width: u32,
     height: u32,