From 5206f05fdf77bb65c125ddb133cf46a59608c671 Mon Sep 17 00:00:00 2001 From: Andrew Opalach Date: Tue, 24 Dec 2024 14:52:51 -0500 Subject: Bring in line with dependency changes Signed-off-by: Andrew Opalach --- src/codec/wuffs/demuxer.h | 2 +- src/codec/wuffs/impl.c | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'src/codec/wuffs') diff --git a/src/codec/wuffs/demuxer.h b/src/codec/wuffs/demuxer.h index 6e9e391..c2cb8a5 100644 --- a/src/codec/wuffs/demuxer.h +++ b/src/codec/wuffs/demuxer.h @@ -5,7 +5,7 @@ struct camu_wuffs_demuxer { struct camu_demuxer demux; struct cch_handle *handle; - struct aki_buffer buffer; + struct nn_buffer buffer; bool eof; }; diff --git a/src/codec/wuffs/impl.c b/src/codec/wuffs/impl.c index 4d9ea7e..378ac00 100644 --- a/src/codec/wuffs/impl.c +++ b/src/codec/wuffs/impl.c @@ -1,4 +1,4 @@ -#include +#include #define WUFFS_IMPLEMENTATION #define WUFFS_CONFIG__STATIC_FUNCTIONS #define WUFFS_CONFIG__MODULES @@ -22,13 +22,13 @@ static bool wuffs_demuxer_init(struct camu_demuxer *demux, struct cch_handle *ha struct camu_wuffs_demuxer *wfs = (struct camu_wuffs_demuxer *)demux; wfs->handle = handle; - aki_buffer_init(&wfs->buffer); + nn_buffer_init(&wfs->buffer); wfs->eof = false; cch_handle_seek(wfs->handle, 0, SEEK_SET); off_t size = cch_entry_get_size(wfs->handle->entry); - aki_buffer_ensure_space(&wfs->buffer, size); - cch_handle_read(wfs->handle, aki_buffer_get_ptr(&wfs->buffer, 0), size); + nn_buffer_ensure_space(&wfs->buffer, size); + cch_handle_read(wfs->handle, nn_buffer_get_ptr(&wfs->buffer, 0), size); wfs->buffer.size = size; wuffs_png__decoder wf_dec = { 0 }; @@ -38,7 +38,7 @@ static bool wuffs_demuxer_init(struct camu_demuxer *demux, struct cch_handle *ha wuffs_png__decoder__set_quirk(&wf_dec, WUFFS_BASE__QUIRK_IGNORE_CHECKSUM, true); wuffs_base__io_buffer src = { 0 }; - src.data.ptr = aki_buffer_get_ptr(&wfs->buffer, 0); + src.data.ptr = nn_buffer_get_ptr(&wfs->buffer, 0); src.data.len = wfs->buffer.size; src.meta.wi = wfs->buffer.size; src.meta.closed = true; @@ -90,7 +90,7 @@ static bool wuffs_demuxer_seek(struct camu_demuxer *demux, u64 pos) static void wuffs_demuxer_free(struct camu_demuxer **demux) { struct camu_wuffs_demuxer *wfs = (struct camu_wuffs_demuxer *)*demux; - aki_buffer_free(&wfs->buffer); + nn_buffer_free(&wfs->buffer); al_array_free(wfs->demux.streams); al_free(wfs); *demux = NULL; @@ -127,7 +127,7 @@ static s32 wuffs_decoder_push(struct camu_decoder *dec, struct camu_codec_packet wuffs_png__decoder__set_quirk(&wf_dec, WUFFS_BASE__QUIRK_IGNORE_CHECKSUM, true); wuffs_base__io_buffer src = { 0 }; - src.data.ptr = aki_buffer_get_ptr(packet->buffer, 0); + src.data.ptr = nn_buffer_get_ptr(packet->buffer, 0); src.data.len = packet->buffer->size; src.meta.wi = packet->buffer->size; src.meta.closed = true; -- cgit v1.2.3-101-g0448