From c9de724be0602be4f53c65486a256da5da69183c Mon Sep 17 00:00:00 2001 From: iabdalkader Date: Sat, 29 Jun 2024 20:16:47 +0200 Subject: [PATCH] misc: Rename JPEG buffer size. --- src/omv/imlib/framebuffer.c | 2 +- src/omv/ports/rp2/main.c | 2 +- src/omv/ports/rp2/rp2.ld.S | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/omv/imlib/framebuffer.c b/src/omv/imlib/framebuffer.c index 0bfcb587a..9adf0f508 100644 --- a/src/omv/imlib/framebuffer.c +++ b/src/omv/imlib/framebuffer.c @@ -15,7 +15,7 @@ #define FB_ALIGN_SIZE_ROUND_DOWN(x) (((x) / FRAMEBUFFER_ALIGNMENT) * FRAMEBUFFER_ALIGNMENT) #define FB_ALIGN_SIZE_ROUND_UP(x) FB_ALIGN_SIZE_ROUND_DOWN(((x) + FRAMEBUFFER_ALIGNMENT - 1)) -#define CONSERVATIVE_JPEG_BUF_SIZE (OMV_JPEG_BUF_SIZE - 64) +#define CONSERVATIVE_JPEG_BUF_SIZE (OMV_JPEG_SIZE - 64) extern char _fb_base; extern char _fb_end; diff --git a/src/omv/ports/rp2/main.c b/src/omv/ports/rp2/main.c index 5822b06be..d048198d6 100644 --- a/src/omv/ports/rp2/main.c +++ b/src/omv/ports/rp2/main.c @@ -74,7 +74,7 @@ extern void pendsv_init(void); extern uint8_t __StackTop, __StackBottom; -static char OMV_ATTR_SECTION(OMV_ATTR_ALIGNED(gc_heap[OMV_HEAP_SIZE], 4), ".heap"); +static char OMV_ATTR_SECTION(OMV_ATTR_ALIGNED(gc_heap[OMV_GC_BLOCK0_SIZE], 4), ".heap"); uint8_t *OMV_BOARD_UID_ADDR; static pico_unique_board_id_t OMV_ATTR_ALIGNED(pico_unique_id, 4); diff --git a/src/omv/ports/rp2/rp2.ld.S b/src/omv/ports/rp2/rp2.ld.S index 886725188..0d1419e79 100644 --- a/src/omv/ports/rp2/rp2.ld.S +++ b/src/omv/ports/rp2/rp2.ld.S @@ -199,7 +199,7 @@ SECTIONS #if !defined(OMV_JPEG_MEMORY) _jpeg_buf = .; // IDE JPEG buffer - . = . + OMV_JPEG_BUF_SIZE; + . = . + OMV_JPEG_SIZE; . = ALIGN(4); #endif } >OMV_FB_MEMORY