Mercurial > love-experiments
changeset 1426:a5e46f43e3d6 image-CompressedData
Made the getSize() and getData() methods for CompressedData consistent with each other. Note that CompressedData's data may not all be contiguous in memory, so getData(miplevel) and getSize(miplevel) should always be used instead.
| author | Alex Szpakowski <slime73@gmail.com> |
|---|---|
| date | Tue, 09 Apr 2013 23:39:20 -0300 |
| parents | 4d66b8cbe5a9 |
| children | 59f5284fe9eb |
| files | src/modules/image/CompressedData.cpp src/modules/image/CompressedData.h |
| diffstat | 2 files changed, 16 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/src/modules/image/CompressedData.cpp Mon Apr 08 21:58:20 2013 -0300 +++ b/src/modules/image/CompressedData.cpp Tue Apr 09 23:39:20 2013 -0300 @@ -36,18 +36,23 @@ int CompressedData::getSize() const { - size_t totalsize = sizeof(SubImage) * dataImages.size(); - - for (size_t i = 0; i < dataImages.size(); i++) - totalsize += dataImages[i].size; - - return totalsize; + // Adding up the total size for all mipmap levels would make more sense, but + // it's probably better for getSize() to match getData() so no bad memory + // accesses happen... + if (dataImages.size() > 0) + return dataImages[0].size; + else + return 0; } void *CompressedData::getData() const { - // ? - return (void *) &dataImages[0].data[0]; + // Data for different mipmap levels is not stored contiguously in memory, so + // getData() won't work properly for CompressedData. + if (dataImages.size() > 0) + return (void *) &(dataImages[0].data[0]); + else + return 0; } int CompressedData::getNumMipmaps() const
--- a/src/modules/image/CompressedData.h Mon Apr 08 21:58:20 2013 -0300 +++ b/src/modules/image/CompressedData.h Tue Apr 09 23:39:20 2013 -0300 @@ -70,7 +70,9 @@ CompressedData(); virtual ~CompressedData(); - // Implements Data. + // Implements Data. Note that data for different mipmap levels is not always + // stored contiguously in memory, so getData() and getSize() don't make + // much sense. Use getData(miplevel) and getSize(mipleveL) instead. virtual void *getData() const; virtual int getSize() const;