some compiler errors

microsoft · Jan 22, 2024 · 4b230a5 · 4b230a5
1 parent 91c19a5
commit 4b230a5
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/libs/core/pxt.h b/libs/core/pxt.h
@@ -42,7 +42,6 @@ static inline ImageData *imageBytes(ImageLiteral_ lit) {
 typedef MicroBitPin DevicePin;
 
 typedef RefMImage *Image;
-typedef RefImage *SImage;
 
 extern MicroBit uBit;
 extern MicroBitEvent lastEvent;

diff --git a/libs/screen/image.cpp b/libs/screen/image.cpp
@@ -1313,16 +1313,16 @@ void drawVLine(SImage_ img, int x, int y, int h, int c) {
 
 void fillTriangle(SImage_ img, int x0, int y0, int x1, int y1, int x2, int y2, int c) {
     if (x1 < x0) {
-        swap(x0, x1);
-        swap(y0, y1);
+        pxt::swap(x0, x1);
+        pxt::swap(y0, y1);
     }
     if (x2 < x1) {
-        swap(x1, x2);
-        swap(y1, y2);
+        pxt::swap(x1, x2);
+        pxt::swap(y1, y2);
     }
     if (x1 < x0) {
-        swap(x0, x1);
-        swap(y0, y1);
+        pxt::swap(x0, x1);
+        pxt::swap(y0, y1);
     }
 
     LineGenState lines[] = {

diff --git a/libs/st7735/pxt.json b/libs/st7735/pxt.json
@@ -19,7 +19,8 @@
         "font12.jres",
         "arcadegamepad.h",
         "indexedscreen.h",
-        "arcadesound.h"
+        "arcadesound.h",
+        "jddisplay.cpp"
     ],
     "dependencies": {
         "core": "file:../core"