UI: update IMAGE handling

Author: chrisws

src/ui/form.cpp

@@ -236,13 +236,6 @@ FormInput *create_input(var_p_t v_field) {
   return widget;
 }
 
-void create_func(var_p_t form, const char *name, method cb) {
-  var_p_t v_func = map_add_var(form, name, 0);
-  v_func->type = V_FUNC;
-  v_func->v.fn.self = form;
-  v_func->v.fn.cb = cb;
-}
-
 // creates a new form using the given map
 extern "C" void v_create_form(var_p_t var) {
   bool hasInputs = false;

src/ui/graphics.cpp

@@ -283,18 +283,20 @@ void Graphics::drawText(int left, int top, const char *str, int len) {
 void Graphics::getImageData(Canvas *canvas, uint8_t *image,
                             const MARect *srcRect, int bytesPerLine) {
   size_t scale = 1;
-  int w = bytesPerLine;
+  int x_end = srcRect->left + srcRect->width;
+  int y_end = srcRect->top + srcRect->height;
   if (canvas == HANDLE_SCREEN) {
     canvas = _screen;
   }
-  for (int dy = 0, y = srcRect->top; y < srcRect->height; y += scale, dy++) {
-    if (y >= canvas->y() && y <  canvas->h()) {
+  for (int dy = 0, y = srcRect->top; y < y_end; y += scale, dy++) {
+    if (y >= canvas->y() && y < canvas->h()) {
       pixel_t *line = canvas->getLine(y);
-      for (int dx = 0, x = srcRect->left; x < srcRect->width; x += scale, dx++) {
+      int yoffs = (dy * bytesPerLine * 4);
+      for (int dx = 0, x = srcRect->left; x < x_end; x += scale, dx++) {
         if (x >= canvas->x() && x < canvas->w()) {
-          uint8_t r,g,b;
+          uint8_t r, g, b;
           GET_RGB2(line[x], r, g, b);
-          int offs = (4 * dy * w) + (4 * dx);
+          int offs = yoffs + (dx * 4);
           image[offs + 0] = r;
           image[offs + 1] = g;
           image[offs + 2] = b;

src/ui/image.cpp

@@ -16,7 +16,9 @@
 #include "common/var.h"
 #include "common/var_map.h"
 #include "lib/maapi.h"
+#include "ui/image.h"
 #include "ui/system.h"
+#include "ui/graphics.h"
 
 #if !defined(LODEPNG_NO_COMPILE_CPP)
   #define LODEPNG_NO_COMPILE_CPP
@@ -40,8 +42,6 @@ extern System *g_system;
 unsigned nextId = 0;
 strlib::List<ImageBuffer *> cache;
 
-void create_func(var_p_t form, const char *name, method cb);
-
 void reset_image_cache() {
   cache.removeAll();
 }
@@ -129,7 +129,7 @@ uint8_t *get_image_data(int x, int y, int w, int h) {
   rc.top = y;
   rc.width = w;
   rc.height = h;
-  int size = w * 4 * h * 4;
+  int size = w * h * 4;
   uint8_t *result = (uint8_t *)malloc(size);
   if (result != NULL) {
     g_system->getOutput()->redraw();
@@ -188,13 +188,21 @@ ImageBuffer *load_image(var_t *var) {
   } else if (var->type == V_ARRAY && var->v.a.maxdim == 2) {
     int w = ABS(var->v.a.lbound[0] - var->v.a.ubound[0]) + 1;
     int h = ABS(var->v.a.lbound[1] - var->v.a.ubound[1]) + 1;
-    unsigned char *image = (unsigned char *)malloc(w * h);
+    int size = w * h * 4;
+    unsigned char *image = (unsigned char *)malloc(size);
     for (int y = 0; y < h; y++) {
+      int yoffs = (4 * y * w);
       for (int x = 0; x < w; x++) {
         int pos = y * w + x;
         var_t *elem = (var_t *) (var->v.a.ptr + (sizeof(var_t) * pos));
-        // TODO combine RGBA from next four bytes of image[pos]
-        //image[pos] = v_getint(elem);
+        pixel_t px = v_getint(elem);
+        uint8_t r, g, b;
+        GET_RGB2(px, r, g, b);
+        int offs = yoffs + (4 * x);
+        image[offs + 0] = r;
+        image[offs + 1] = g;
+        image[offs + 2] = b;
+        image[offs + 3] = 255;
       }
     }
     result = new ImageBuffer();
@@ -385,11 +393,16 @@ void cmd_image_save(var_s *self) {
     } else if (array != NULL) {
       v_tomatrix(array, w, h);
       for (int y = 0; y < h; y++) {
+        int yoffs = (4 * y * w);
         for (int x = 0; x < w; x++) {
+          int offs = yoffs + (4 * x);
+          uint8_t r = image->_image[offs + 0];
+          uint8_t g = image->_image[offs + 1];
+          uint8_t b = image->_image[offs + 2];
+          pixel_t px = SET_RGB(r, g, b);
           int pos = y * w + x;
           var_t *elem = (var_t *) (array->v.a.ptr + (sizeof(var_t) * pos));
-          // TODO combine RGBA from next four bytes of image[pos]
-          //v_setint(elem, image->_image[pos]);
+          v_setint(elem, px);
         }
       }
       saved = true;

src/ui/system.cpp

@@ -19,7 +19,6 @@
 #include "common/keymap.h"
 #include "ui/system.h"
 #include "ui/inputs.h"
-#include "ui/image.h"
 
 #define MENU_CONSOLE    0
 #define MENU_SOURCE     1
@@ -1173,3 +1172,9 @@ int maGetMilliSecondCount(void) {
   return dev_get_millisecond_count();
 }
 
+void create_func(var_p_t form, const char *name, method cb) {
+  var_p_t v_func = map_add_var(form, name, 0);
+  v_func->type = V_FUNC;
+  v_func->v.fn.self = form;
+  v_func->v.fn.cb = cb;
+}

src/ui/system.h

@@ -18,6 +18,9 @@
   #include "platform/fltk/system.h"
 #else
 
+void create_func(var_p_t form, const char *name, method cb);
+void reset_image_cache();
+
 struct Cache : public strlib::Properties {
   Cache(int size) : Properties(size * 2), _index(0) {}
   void add(const char *key, const char *value);

src/ui/window.cpp

@@ -16,7 +16,6 @@
 #include "ui/system.h"
 
 extern System *g_system;
-void create_func(var_p_t form, const char *name, method cb);
 
 #define WINDOW_SCREEN1  "graphicsScreen1"
 #define WINDOW_SCREEN2  "graphicsScreen2"