Merge branch 'jqln/lvgl-bump'

1 files changed, 9 insertions, 11 deletions

diff --git a/lib/luavgl/src/imgdata.c b/lib/luavgl/src/imgdata.c
index 9f7a2a01..33bd7269 100644
--- a/lib/luavgl/src/imgdata.c
+++ b/lib/luavgl/src/imgdata.c
@@ -1,12 +1,11 @@
-#include "draw/lv_img_buf.h"
-#include "draw/lv_img_decoder.h"
+#include "draw/lv_image_decoder.h"
 #include "lauxlib.h"
 #include "lua.h"
 #include "luavgl.h"
 #include "misc/lv_color.h"
-#include "misc/lv_mem.h"
 #include "misc/lv_types.h"
 #include "private.h"
+#include "stdlib/lv_mem.h"
 #include <stdint.h>
 #include <string.h>
 
@@ -16,22 +15,21 @@ static int luavgl_imgdata_create(lua_State *L)
     return luaL_argerror(L, 1, "expect string");
   }
 
-  lv_img_decoder_dsc_t descriptor;
-  lv_res_t res =
-      lv_img_decoder_open(&descriptor, lua_tostring(L, 1), lv_color_black(), 0);
+  lv_image_decoder_dsc_t descriptor;
+  lv_res_t res = lv_image_decoder_open(&descriptor, lua_tostring(L, 1), NULL);
   if (res != LV_RES_OK) {
     return luaL_error(L, "failed to decode image.");
   }
 
-  lv_img_dsc_t *data = lv_mem_alloc(sizeof(lv_img_dsc_t));
+  lv_image_dsc_t *data = lv_malloc(sizeof(lv_image_dsc_t));
   data->header = descriptor.header;
-  data->data_size = data->header.w * data->header.h * sizeof(uint32_t); // ???
+  data->data_size = descriptor.decoded->data_size;
 
-  uint8_t *data_copy = lv_mem_alloc(data->data_size);
-  memcpy(data_copy, descriptor.img_data, data->data_size);
+  uint8_t *data_copy = lv_malloc(data->data_size);
+  memcpy(data_copy, descriptor.decoded->data, data->data_size);
   data->data = data_copy;
 
-  lv_img_decoder_close(&descriptor);
+  lv_image_decoder_close(&descriptor);
 
   lua_pushlightuserdata(L, data);
   return 1;