ANDROID: Fix POINT returning transposed red + blue

Author: chrisws

ChangeLog

@@ -1,10 +1,13 @@
-2019-14-23 (0.12.15)
+2019-02-26 (0.12.15)
+	ANDROID: Fix POINT returning transposed red + blue
+
+2019-02-14 (0.12.15)
 	ANDROID: fix crash entering c,v in edit control mode
 
-2019-14-02 (0.12.15)
+2019-02-14 (0.12.15)
 	ANDROID: fix crash passing negative duration to SOUND command
 
-2019-11-02 (0.12.15)
+2019-02-11 (0.12.15)
 	UI: ALT+F4 from edit/run now returns to edit
 	UI: avoid flicker from with ALT+F4 -e edit startup
 

src/ui/graphics.cpp

@@ -297,11 +297,17 @@ void Graphics::drawRGB(const MAPoint2d *dstPoint, const void *src,
             dX <  _drawTarget->w()) {
           // get RGBA components
           uint8_t r,g,b,a;
+#if defined(PIXELFORMAT_RGBA8888)
+          b = image[4 * y * w + 4 * x + 0]; // blue
+          g = image[4 * y * w + 4 * x + 1]; // green
+          r = image[4 * y * w + 4 * x + 2]; // red
+          a = image[4 * y * w + 4 * x + 3]; // alpha
+#else
           r = image[4 * y * w + 4 * x + 0]; // red
           g = image[4 * y * w + 4 * x + 1]; // green
           b = image[4 * y * w + 4 * x + 2]; // blue
           a = image[4 * y * w + 4 * x + 3]; // alpha
-
+#endif
           uint8_t dR, dG, dB;
           GET_RGB(line[dX], dR, dG, dB);
           if (opacity > 0 && opacity < 100 && a > 64) {

src/ui/rgb.h

@@ -45,7 +45,7 @@ inline void GET_ARGB(pixel_t c, uint8_t &a, uint8_t &r, uint8_t &g, uint8_t &b)
   #define SET_RGB(r, g, b) ((0xff000000) | (r << 16) | (g << 8) | (b))
   #define SET_ARGB(a, r, g, b) (a << 24 | (r << 16) | (g << 8) | (b))
   #define GET_RGB RGB888_to_RGB
-  #define GET_RGB2 RGB888_to_RGB
+  #define GET_RGB2 RGB888_BE_to_RGB
   #define GET_FROM_RGB888 RGB888_to_RGBA8888
 #else
   #define SET_RGB(r, g, b) ((r << 16) | (g << 8) | (b))