From 2c3463a6381cb84e4c0b97270616c55cf63e3717 Mon Sep 17 00:00:00 2001 From: falkTX Date: Sat, 27 Aug 2022 02:39:27 +0100 Subject: [PATCH] Make NanoVG::createImageFromMemory take const data Signed-off-by: falkTX --- dgl/NanoVG.hpp | 4 ++-- dgl/src/NanoVG.cpp | 6 +++--- dgl/src/nanovg/nanovg.c | 2 +- dgl/src/nanovg/nanovg.h | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dgl/NanoVG.hpp b/dgl/NanoVG.hpp index bae8f27a..ebafdb99 100644 --- a/dgl/NanoVG.hpp +++ b/dgl/NanoVG.hpp @@ -591,14 +591,14 @@ public: /** Creates image by loading it from the specified chunk of memory. */ - NanoImage::Handle createImageFromMemory(uchar* data, uint dataSize, ImageFlags imageFlags); + NanoImage::Handle createImageFromMemory(const uchar* data, uint dataSize, ImageFlags imageFlags); /** Creates image by loading it from the specified chunk of memory. Overloaded function for convenience. @see ImageFlags */ - NanoImage::Handle createImageFromMemory(uchar* data, uint dataSize, int imageFlags); + NanoImage::Handle createImageFromMemory(const uchar* data, uint dataSize, int imageFlags); /** Creates image from specified raw format image data. diff --git a/dgl/src/NanoVG.cpp b/dgl/src/NanoVG.cpp index 42c0fcde..f5f0b9fd 100644 --- a/dgl/src/NanoVG.cpp +++ b/dgl/src/NanoVG.cpp @@ -664,18 +664,18 @@ NanoImage::Handle NanoVG::createImageFromFile(const char* filename, int imageFla return NanoImage::Handle(fContext, nvgCreateImage(fContext, filename, imageFlags)); } -NanoImage::Handle NanoVG::createImageFromMemory(uchar* data, uint dataSize, ImageFlags imageFlags) +NanoImage::Handle NanoVG::createImageFromMemory(const uchar* data, uint dataSize, ImageFlags imageFlags) { return createImageFromMemory(data, dataSize, static_cast(imageFlags)); } -NanoImage::Handle NanoVG::createImageFromMemory(uchar* data, uint dataSize, int imageFlags) +NanoImage::Handle NanoVG::createImageFromMemory(const uchar* data, uint dataSize, int imageFlags) { if (fContext == nullptr) return NanoImage::Handle(); DISTRHO_SAFE_ASSERT_RETURN(data != nullptr, NanoImage::Handle()); DISTRHO_SAFE_ASSERT_RETURN(dataSize > 0, NanoImage::Handle()); - return NanoImage::Handle(fContext, nvgCreateImageMem(fContext, imageFlags, data,static_cast(dataSize))); + return NanoImage::Handle(fContext, nvgCreateImageMem(fContext, imageFlags, data, static_cast(dataSize))); } NanoImage::Handle NanoVG::createImageFromRawMemory(uint w, uint h, const uchar* data, diff --git a/dgl/src/nanovg/nanovg.c b/dgl/src/nanovg/nanovg.c index c92af25b..35f1da56 100644 --- a/dgl/src/nanovg/nanovg.c +++ b/dgl/src/nanovg/nanovg.c @@ -869,7 +869,7 @@ int nvgCreateImage(NVGcontext* ctx, const char* filename, int imageFlags) return image; } -int nvgCreateImageMem(NVGcontext* ctx, int imageFlags, unsigned char* data, int ndata) +int nvgCreateImageMem(NVGcontext* ctx, int imageFlags, const unsigned char* data, int ndata) { int w, h, n, image; unsigned char* img = stbi_load_from_memory(data, ndata, &w, &h, &n, 4); diff --git a/dgl/src/nanovg/nanovg.h b/dgl/src/nanovg/nanovg.h index 89b4dd80..027e8283 100644 --- a/dgl/src/nanovg/nanovg.h +++ b/dgl/src/nanovg/nanovg.h @@ -385,7 +385,7 @@ int nvgCreateImage(NVGcontext* ctx, const char* filename, int imageFlags); // Creates image by loading it from the specified chunk of memory. // Returns handle to the image. -int nvgCreateImageMem(NVGcontext* ctx, int imageFlags, unsigned char* data, int ndata); +int nvgCreateImageMem(NVGcontext* ctx, int imageFlags, const unsigned char* data, int ndata); // Creates image from specified image data and texture format. // Returns handle to the image.