add mem parent and heap to image allocator

recp · Oct 16, 2023 · 182c299 · 182c299
1 parent 47901fd
commit 182c299
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/include/ak/image.h b/include/ak/image.h
@@ -110,11 +110,15 @@ void
 ak_imageLoad(AkImage * __restrict image);
 
 /* Loader Configurator */
-typedef void* (*AkImageLoadFromFileFn)(const char * __restrict path,
+typedef void* (*AkImageLoadFromFileFn)(AkHeap     * __restrict heap,
+                                       void       * __restrict memparent,
+                                       const char * __restrict path,
                                        int        * __restrict width,
                                        int        * __restrict height,
                                        int        * __restrict components);
-typedef void* (*AkImageLoadFromMemoryFn)(const char * __restrict data,
+typedef void* (*AkImageLoadFromMemoryFn)(AkHeap     * __restrict heap,
+                                         void       * __restrict memparent,
+                                         const char * __restrict data,
                                          size_t                  len,
                                          int        * __restrict width,
                                          int        * __restrict height,

diff --git a/include/ak/memory.h b/include/ak/memory.h
@@ -34,7 +34,8 @@ typedef struct AkObject {
   char   data[];
 } AkObject;
 
-#define ak_objGet(OBJ) ((OBJ)->pData)
+#define ak_objGetOrNull(OBJ) (OBJ ? (OBJ)->pData : NULL)
+#define ak_objGet(OBJ)       ((OBJ)->pData)
 #define ak_allocator ak_mem_allocator()
 
 typedef struct AkHeapAllocator {

diff --git a/src/image/image.c b/src/image/image.c
@@ -79,7 +79,7 @@ ak_imageLoad(AkImage * __restrict image) {
         return;
 
       path = ak_fullpath(doc, initFrom->ref, pathbuf);
-      data = ak__img_conf.loadFromFile(path, &x, &y, &ch);
+      data = ak__img_conf.loadFromFile(heap, image, path, &x, &y, &ch);
       if (!data)
         return;
 
@@ -94,7 +94,9 @@ ak_imageLoad(AkImage * __restrict image) {
       if (!ak__img_conf.loadFromMemory)
         return;
 
-      data = ak__img_conf.loadFromMemory(initFrom->buff->data,
+      data = ak__img_conf.loadFromMemory(heap,
+                                         image,
+                                         initFrom->buff->data,
                                          (int)initFrom->buff->length,
                                          &x, &y, &ch);