UI: make image save and load compatible.

Author: chrisws

src/platform/fltk/display.cxx

@@ -135,12 +135,12 @@ void drawImage(void *data, int x, int y, int w, uchar *out) {
 
   for (int sx = 0; sx < scanLine; sx += 4, i_offs += 4, s_offs += 4) {
     uint8_t a = image[i_offs + 3];
-    uint8_t r = image[i_offs + 2];
+    uint8_t b = image[i_offs + 2];
     uint8_t g = image[i_offs + 1];
-    uint8_t b = image[i_offs + 0];
-    uint8_t sR = screen[s_offs + 2];
+    uint8_t r = image[i_offs + 0];
+    uint8_t sB = screen[s_offs + 2];
     uint8_t sG = screen[s_offs + 1];
-    uint8_t sB = screen[s_offs + 0];
+    uint8_t sR = screen[s_offs + 0];
     if (opacity > 0 && opacity < 100 && a > 64) {
       sR = (op * r) + ((1 - op) * sR);
       sG = (op * g) + ((1 - op) * sG);
@@ -151,9 +151,9 @@ void drawImage(void *data, int x, int y, int w, uchar *out) {
       sB = sB + ((b - sB) * a / 255);
     }
     out[sx + 3] = a;
-    out[sx + 2] = sR;
+    out[sx + 2] = sB;
     out[sx + 1] = sG;
-    out[sx + 0] = sB;
+    out[sx + 0] = sR;
   }
 }
 

src/ui/image.cpp

@@ -114,12 +114,13 @@ void ImageDisplay::draw(int x, int y, int w, int h, int cw) {
   }
 }
 
-void argb_to_abgr(unsigned char *image, unsigned w, unsigned h) {
-#if !defined(PIXELFORMAT_ARGB8888)
+void to_argb(unsigned char *image, unsigned w, unsigned h) {
+#if defined(_SDL)
+  // convert from LCT_RGBA to ARGB
   for (unsigned y = 0; y < h; y++) {
-    unsigned yoffs = (4 * y * w);
+    unsigned yoffs = (y * w * 4);
     for (unsigned x = 0; x < w; x++) {
-      unsigned offs = yoffs + (4 * x);
+      unsigned offs = yoffs + (x * 4);
       uint8_t r = image[offs + 2];
       uint8_t b = image[offs + 0];
       image[offs + 2] = b;
@@ -132,43 +133,46 @@ void argb_to_abgr(unsigned char *image, unsigned w, unsigned h) {
 unsigned decode_png(unsigned char **image, unsigned *w, unsigned *h, const unsigned char *buffer, size_t size) {
   unsigned error = lodepng_decode32(image, w, h, buffer, size);
   if (!error) {
-    argb_to_abgr(*image, *w, *h);
+    to_argb(*image, *w, *h);
   }
   return error;
 }
 
 unsigned decode_png_file(unsigned char **image, unsigned *w, unsigned *h, const char *filename) {
   unsigned error = lodepng_decode32_file(image, w, h, filename);
   if (!error) {
-    argb_to_abgr(*image, *w, *h);
+    to_argb(*image, *w, *h);
   }
   return error;
 }
 
 unsigned encode_png_file(const char *filename, const unsigned char *image, unsigned w, unsigned h) {
   unsigned result;
-#if defined(PIXELFORMAT_ARGB8888)
-  result = lodepng_encode32_file(filename, image, w, h);
-#else
+#if defined(_SDL)
   unsigned size = w * h * 4;
   auto imageCopy = (uint8_t *)malloc(size);
   if (!imageCopy) {
+    // lodepng memory error code
     result = 83;
   } else {
+    // convert from ARGB to LCT_RGBA
     for (unsigned y = 0; y < h; y++) {
-      unsigned yoffs = (4 * y * w);
+      unsigned yoffs = (y * w * 4);
       for (unsigned x = 0; x < w; x++) {
         int offs = yoffs + (x * 4);
-        uint8_t a = image[offs + 3];
-        uint8_t r = image[offs + 2];
-        uint8_t g = image[offs + 1];
-        uint8_t b = image[offs + 0];
-        SET_IMAGE_ARGB(imageCopy, offs, a, r, g, b);
+        uint8_t a, r, g, b;
+        GET_IMAGE_ARGB(image, offs, a, r, g, b);
+        imageCopy[offs + 3] = a;
+        imageCopy[offs + 2] = b;
+        imageCopy[offs + 1] = g;
+        imageCopy[offs + 0] = r;
       }
     }
     result = lodepng_encode32_file(filename, imageCopy, w, h);
     free(imageCopy);
   }
+#else
+  result = lodepng_encode32_file(filename, image, w, h);
 #endif
   return result;
 }
@@ -200,7 +204,6 @@ uint8_t *get_image_data(int x, int y, int w, int h) {
   return result;
 }
 
-
 ImageBuffer *get_image(unsigned bid) {
   ImageBuffer *result = nullptr;
   List_each(ImageBuffer *, it, buffers) {
@@ -260,11 +263,11 @@ ImageBuffer *load_image(var_t *var) {
     int size = w * h * 4;
     auto image = (uint8_t *)malloc(size);
     for (int y = 0; y < h; y++) {
-      int yoffs = (4 * y * w);
+      int yoffs = (y * w * 4);
       for (int x = 0; x < w; x++) {
         int pos = y * w + x;
         uint8_t a, r, g, b;
-        v_get_argb(-v_getint(v_elem(var, pos)), a, r, g, b);
+        v_get_argb(v_getint(v_elem(var, pos)), a, r, g, b);
         SET_IMAGE_ARGB(image, yoffs + (x * 4), a, r, g, b);
       }
     }
@@ -483,14 +486,13 @@ void cmd_image_save(var_s *self, var_s *) {
       // y1  rgba rgba rgba  ypos=12
       //
       for (unsigned y = 0; y < h; y++) {
-        unsigned yoffs = (4 * y * w);
+        unsigned yoffs = (y * w * 4);
         for (unsigned x = 0; x < w; x++) {
           uint8_t a, r, g, b;
           GET_IMAGE_ARGB(image->_image, yoffs + (x * 4), a, r, g, b);
           pixel_t px = v_get_argb_px(a, r, g, b);
           unsigned pos = y * w + x;
-          var_t *elem = v_elem(array, pos);
-          v_setint(elem, -px);
+          v_setint(v_elem(array, pos), px);
         }
       }
       saved = true;

src/ui/rgb.h

@@ -26,24 +26,25 @@ inline void v_get_argb(pixel_t c, uint8_t &a, uint8_t &r, uint8_t &g, uint8_t &b
 
 #define v_get_argb_px(a, r, g, b) (a << 24 | (r << 16) | (g << 8) | (b))
 
-#if defined(PIXELFORMAT_ARGB8888)
+#if defined(_SDL)
+// SDL_PACKEDORDER_XRGB
+// A = byte 3
+// R = byte 2
+// G = byte 1
+// B = byte 0
 
 #define GET_RGB_PX(r, g, b) ((0xff000000) | (r << 16) | (g << 8) | (b))
 
-inline pixel_t GET_FROM_RGB888(unsigned c) {
-  uint8_t r = (c & 0xff0000) >> 16;
-  uint8_t g = (c & 0xff00) >> 8;
-  uint8_t b = (c & 0xff);
-  return ((0xff000000) | (b << 16) | (g << 8) | (r));
-}
+// same as internal format
+#define GET_FROM_RGB888(c) (c)
 
 inline void GET_RGB(pixel_t c, uint8_t &r, uint8_t &g, uint8_t &b) {
   r = (c & 0xff0000) >> 16;
   g = (c & 0xff00) >> 8;
   b = (c & 0xff);
 }
 
-inline void GET_IMAGE_ARGB(uint8_t *image, unsigned offs, uint8_t &a, uint8_t &r, uint8_t &g, uint8_t &b) {
+inline void GET_IMAGE_ARGB(const uint8_t *image, unsigned offs, uint8_t &a, uint8_t &r, uint8_t &g, uint8_t &b) {
   a = image[offs + 3];
   r = image[offs + 2];
   g = image[offs + 1];
@@ -59,22 +60,22 @@ inline void SET_IMAGE_ARGB(uint8_t *image, unsigned offs, uint8_t a, uint8_t r,
 
 #else
 
-// A = byte 3
-// B = byte 2
-// G = byte 1
-// R = byte 0
-
 #define GET_RGB_PX(r, g, b) ((0xff000000) | (b << 16) | (g << 8) | (r))
 
-#define GET_FROM_RGB888(c) (c)
+inline pixel_t GET_FROM_RGB888(unsigned c) {
+  uint8_t r = (c & 0xff0000) >> 16;
+  uint8_t g = (c & 0xff00) >> 8;
+  uint8_t b = (c & 0xff);
+  return ((0xff000000) | (b << 16) | (g << 8) | (r));
+}
 
 inline void GET_RGB(pixel_t c, uint8_t &r, uint8_t &g, uint8_t &b) {
   b = (c & 0xff0000) >> 16;
   g = (c & 0xff00) >> 8;
   r = (c & 0xff);
 }
 
-inline void GET_IMAGE_ARGB(uint8_t *image, unsigned offs, uint8_t &a, uint8_t &r, uint8_t &g, uint8_t &b) {
+inline void GET_IMAGE_ARGB(const uint8_t *image, unsigned offs, uint8_t &a, uint8_t &r, uint8_t &g, uint8_t &b) {
   a = image[offs + 3];
   b = image[offs + 2];
   g = image[offs + 1];