Merge pull request #83 from tekktrik/dev/switch-typing-module

[hackapet/Adafruit_Blinka_Displayio.git] / displayio / _bitmap.py

diff --git a/displayio/_bitmap.py b/displayio/_bitmap.py
index f28e72a15961201994042f92deaaf028b13f71eb..9d06a6364a4ae632a0827849b308b22223c91d9e 100644 (file)
--- a/displayio/_bitmap.py
+++ b/displayio/_bitmap.py
@@ -19,14 +19,12 @@ displayio for Blinka
 
 from __future__ import annotations
 from typing import Union, Tuple
 
 from __future__ import annotations
 from typing import Union, Tuple

-from recordclass import recordclass

 from PIL import Image
 from PIL import Image

+from ._structs import RectangleStruct

 
 __version__ = "0.0.0-auto.0"
 __repo__ = "https://github.com/adafruit/Adafruit_Blinka_displayio.git"
 
 
 __version__ = "0.0.0-auto.0"
 __repo__ = "https://github.com/adafruit/Adafruit_Blinka_displayio.git"
 

-Rectangle = recordclass("Rectangle", "x1 y1 x2 y2")
-

 
 class Bitmap:
     """Stores values of a certain size in a 2D array"""
 
 class Bitmap:
     """Stores values of a certain size in a 2D array"""


@@ -61,7 +59,7 @@ class Bitmap:
             raise NotImplementedError("Invalid bits per value")
 
         self._image = Image.new("P", (width, height), 0)
             raise NotImplementedError("Invalid bits per value")
 
         self._image = Image.new("P", (width, height), 0)

-        self._dirty_area = Rectangle(0, 0, width, height)
+        self._dirty_area = RectangleStruct(0, 0, width, height)

 
     def __getitem__(self, index: Union[Tuple[int, int], int]) -> int:
         """
 
     def __getitem__(self, index: Union[Tuple[int, int], int]) -> int:
         """


@@ -117,7 +115,7 @@ class Bitmap:
     def fill(self, value: int) -> None:
         """Fills the bitmap with the supplied palette index value."""
         self._image = Image.new("P", (self._bmp_width, self._bmp_height), value)
     def fill(self, value: int) -> None:
         """Fills the bitmap with the supplied palette index value."""
         self._image = Image.new("P", (self._bmp_width, self._bmp_height), value)

-        self._dirty_area = Rectangle(0, 0, self._bmp_width, self._bmp_height)
+        self._dirty_area = RectangleStruct(0, 0, self._bmp_width, self._bmp_height)

 
     def blit(
         self,
 
     def blit(
         self,