Split avifRawData and avifStream into read-only (const) and read/write versions, updated code accordingly
diff --git a/src/rawdata.c b/src/rawdata.c
index 86e7476..afff617 100644
--- a/src/rawdata.c
+++ b/src/rawdata.c
@@ -5,7 +5,7 @@
#include <string.h>
-void avifRawDataRealloc(avifRawData * raw, size_t newSize)
+void avifRWDataRealloc(avifRWData * raw, size_t newSize)
{
if (raw->size != newSize) {
uint8_t * old = raw->data;
@@ -20,37 +20,19 @@
}
}
-void avifRawDataSet(avifRawData * raw, const uint8_t * data, size_t len)
+void avifRWDataSet(avifRWData * raw, const uint8_t * data, size_t len)
{
if (len) {
- avifRawDataRealloc(raw, len);
+ avifRWDataRealloc(raw, len);
memcpy(raw->data, data, len);
} else {
avifFree(raw);
}
}
-void avifRawDataFree(avifRawData * raw)
+void avifRWDataFree(avifRWData * raw)
{
avifFree(raw->data);
raw->data = NULL;
raw->size = 0;
}
-
-void avifRawDataConcat(avifRawData * dst, avifRawData ** srcs, int srcsCount)
-{
- size_t totalSize = 0;
- for (int i = 0; i < srcsCount; ++i) {
- totalSize += srcs[i]->size;
- }
-
- avifRawDataRealloc(dst, totalSize);
-
- uint8_t * p = dst->data;
- for (int i = 0; i < srcsCount; ++i) {
- if (srcs[i]->size) {
- memcpy(p, srcs[i]->data, srcs[i]->size);
- p += srcs[i]->size;
- }
- }
-}