Re #3167: Using stb library to load images

2016-02-27 17:33:27 +01:00
parent bdb50052ba
commit dfde65f397
2 changed files with 76 additions and 19 deletions
@@ -24,6 +24,8 @@
 #include <inttypes.h>
 #include "colors.h"

+#define USE_STB
+ 
 // TODO should go to lcd.h again
 typedef int coord_t;
 typedef uint32_t LcdFlags;
@@ -138,7 +140,15 @@ class BitmapBuffer: public BitmapBufferBase<uint16_t>

    void drawBitmapPatternPie(coord_t x0, coord_t y0, const uint8_t * img, LcdFlags flags, int startAngle, int endAngle);

-    static BitmapBuffer * load(const char * filename);
+    static BitmapBuffer * load_bmp(const char * filename);
+    static BitmapBuffer * load_stb(const char * filename);
+    static BitmapBuffer * load(const char * filename) {
+#if defined(USE_STB)
+      return load_stb(filename);
+#else
+      return load_bmp(filename);
+#endif
+    };

    void drawBitmapPattern(coord_t x, coord_t y, const uint8_t * bmp, LcdFlags flags, coord_t offset=0, coord_t width=0);