From 7bcc68136dac2f42593b6c7cc4c07cce7df13d8c Mon Sep 17 00:00:00 2001 From: nick black Date: Sat, 20 Mar 2021 09:08:25 -0400 Subject: [PATCH] [media] fix up oiio/null implementations --- src/media/none.c | 2 +- src/media/oiio.cpp | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/media/none.c b/src/media/none.c index 792079f73..65c8b80f8 100644 --- a/src/media/none.c +++ b/src/media/none.c @@ -79,7 +79,7 @@ void none_printbanner(const notcurses* nc){ fprintf(stderr, "\n Warning! Notcurses was built without multimedia support.\n"); } -const static ncvisual_implementation none_impl = { +static const ncvisual_implementation none_impl = { .visual_init = none_init, .visual_printbanner = none_printbanner, .visual_blit = none_blit, diff --git a/src/media/oiio.cpp b/src/media/oiio.cpp index 801c57275..4aa55dd4f 100644 --- a/src/media/oiio.cpp +++ b/src/media/oiio.cpp @@ -18,7 +18,10 @@ typedef struct ncvisual_details { auto oiio_details_init(void) -> ncvisual_details* { auto deets = static_cast(malloc(sizeof(ncvisual_details))); if(deets){ - memset(deets, 0, sizeof(*deets)); + deets->image = nullptr; + deets->frame = nullptr; + deets->ibuf = nullptr; + deets->framenum = 0; } return deets; } @@ -31,7 +34,7 @@ auto oiio_details_destroy(ncvisual_details* deets) -> void { } auto oiio_create() -> ncvisual* { - auto nc = static_cast(malloc(sizeof(*nc))); + auto nc = static_cast(malloc(sizeof(ncvisual))); if(nc){ memset(nc, 0, sizeof(*nc)); if((nc->details = oiio_details_init()) == nullptr){