LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-15 15:51:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Clean up some compressed texture loading code.

Browse Source
This commit is contained in:
Alex Szpakowski
2022-04-22 22:55:48 -03:00
parent 4e051c6faa
commit a9cca65a14
16 changed files with 37 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/image/CompressedImageData.cpp
+4 -5
View File
@@ -53,7 +53,7 @@ CompressedImageData::CompressedImageData(const std::list<FormatHandler *> &forma
if (format == PIXELFORMAT_UNKNOWN)
throw love::Exception("Could not parse compressed data: Unknown format.");
if (dataImages.size() == 0 || memory->size == 0)
if (dataImages.size() == 0 || memory->getSize() == 0)
throw love::Exception("Could not parse compressed data: No valid data?");
}
@@ -61,8 +61,7 @@ CompressedImageData::CompressedImageData(const CompressedImageData &c)
: format(c.format)
, sRGB(c.sRGB)
{
memory.set(new CompressedMemory(c.memory->size), Acquire::NORETAIN);
memcpy(memory->data, c.memory->data, memory->size);
memory.set(c.memory->clone(), Acquire::NORETAIN);
for (const auto &i : c.dataImages)
{
@@ -83,12 +82,12 @@ CompressedImageData::~CompressedImageData()
size_t CompressedImageData::getSize() const
{
return memory->size;
return memory->getSize();
}
void *CompressedImageData::getData() const
{
return memory->data;
return memory->getData();
}
int CompressedImageData::getMipmapCount() const