Merge commit '40829d4cc85394513ca631cff23254344e29786c' of https://github.com/kmatch98/circuitpython into bitmap-dirty-improvements

jepler · jepler · commit 39500cdeab1f · 2021-03-19T20:40:30.000-05:00
diff --git a/shared-module/displayio/__init__.c b/shared-module/displayio/__init__.c
@@ -321,12 +321,12 @@ bool displayio_area_empty(const displayio_area_t *a) {
 }
 
 void displayio_area_canon(displayio_area_t *a) {
-    if (a->x1 < a->x2) {
+    if (a->x1 > a->x2) {
         int16_t t = a->x1;
         a->x1 = a->x2;
         a->x2 = t;
     }
-    if (a->y1 < a->y2) {
+    if (a->y1 > a->y2) {
         int16_t t = a->y1;
         a->y1 = a->y2;
         a->y2 = t;

Original file line number	Diff line number	Diff line change
`@@ -321,12 +321,12 @@ bool displayio_area_empty(const displayio_area_t *a) {`
`321`	`321`	`}`
`322`	`322`
`323`	`323`	`void displayio_area_canon(displayio_area_t *a) {`
`324`		`- if (a->x1 < a->x2) {`
	`324`	`+ if (a->x1 > a->x2) {`
`325`	`325`	`int16_t t = a->x1;`
`326`	`326`	`a->x1 = a->x2;`
`327`	`327`	`a->x2 = t;`
`328`	`328`	`}`
`329`		`- if (a->y1 < a->y2) {`
	`329`	`+ if (a->y1 > a->y2) {`
`330`	`330`	`int16_t t = a->y1;`
`331`	`331`	`a->y1 = a->y2;`
`332`	`332`	`a->y2 = t;`