UI: make image save and load compatible.

Author: chrisws

src/platform/android/jni/Android.mk

@@ -15,7 +15,7 @@ LOCAL_PATH := $(JNI_PATH)
 include $(CLEAR_VARS)
 LOCAL_MODULE     := smallbasic
 LOCAL_CFLAGS     := -DHAVE_CONFIG_H=1 -DLODEPNG_NO_COMPILE_CPP \
-	                  -DPIXELFORMAT_ARGB8888 -Wno-unknown-pragmas
+	                  -DPIXELFORMAT_RGBA8888 -Wno-unknown-pragmas
 LOCAL_C_INCLUDES := $(SB_HOME) $(SB_HOME)/src  \
                     $(FREETYPE_HOME)/freetype/include/freetype2   \
                     $(FREETYPE_HOME)/freetype/include/freetype2/freetype

src/platform/console/image.cpp

@@ -8,7 +8,7 @@
 // Copyright(C) 2002-2018 Chris Warren-Smith.
 
 #define LODEPNG_NO_COMPILE_CPP
-#define PIXELFORMAT_ARGB8888
+#define PIXELFORMAT_RGBA8888
 #define IMG_WIDTH "width"
 #define IMG_HEIGHT "height"
 #define IMG_NAME "name"

src/platform/fltk/Makefile.am

@@ -10,7 +10,7 @@ AM_CPPFLAGS =                                                 \
   -DPACKAGE_PREFIX=\""$(prefix)"\"                            \
   -DPACKAGE_DATA_DIR=\""$(pkgdatadir)"\"                      \
   -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\"  \
-  -DPIXELFORMAT_ARGB8888=1                                    \
+  -DPIXELFORMAT_RGBA8888=1                                    \
   @PACKAGE_CFLAGS@ @FLTK_CXXFLAGS@
 
 EXTRA_DIST =                      \

src/ui/graphics.cpp

@@ -401,10 +401,11 @@ int Graphics::getPixel(Canvas *canvas, int posX, int posY) {
       && posY < canvas->_h - 1) {
     pixel_t *line = canvas->getLine(posY);
     result = line[posX];
-#if defined(PIXELFORMAT_ARGB8888)
+#if defined(PIXELFORMAT_RGBA8888)
+    // compatibility with PSET/POINT
     uint8_t r, g, b;
     GET_RGB(result, r, g, b);
-    result = GET_RGB_PX(r, g, b);
+    result = v_get_argb_px(255, r, g, b);
 #endif
   }
   return result;

src/ui/screen.cpp

@@ -593,7 +593,6 @@ int GraphicScreen::getPixel(int x, int y) {
   rc.width = 1;
   rc.height = 1;
   int data[1];
-  int result;
 
   if (x < 0 || y < 0) {
     rc.left = x < 0 ? -x : x;
@@ -603,8 +602,7 @@ int GraphicScreen::getPixel(int x, int y) {
   } else {
     maGetImageData(_image, &data, &rc, 1);
   }
-  result = -(data[0] & 0x00FFFFFF);
-  return result;
+  return -(data[0] & 0x00FFFFFF);
 }
 
 // extend the image to allow for additional content on the newline