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.

--HG--
branch : image-CompressedData

src/modules/image/CompressedData.cpp

@@ -36,18 +36,23 @@ CompressedData::~CompressedData()
 
 int CompressedData::getSize() const
 {
-	size_t totalsize = sizeof(SubImage) * dataImages.size();
+	// 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
-	for (size_t i = 0; i < dataImages.size(); i++)
+	// accesses happen...
-		totalsize += dataImages[i].size;
+	if (dataImages.size() > 0)
-
+		return dataImages[0].size;
-	return totalsize;
+	else
+		return 0;
 }
 
 void *CompressedData::getData() const
 {
-	// ?
+	// Data for different mipmap levels is not stored contiguously in memory, so
-	return (void *) &dataImages[0].data[0];
+	// getData() won't work properly for CompressedData.
+	if (dataImages.size() > 0)
+		return (void *) &(dataImages[0].data[0]);
+	else
+		return 0;
 }
 
 int CompressedData::getNumMipmaps() const

src/modules/image/CompressedData.h

@@ -70,7 +70,9 @@ public:
 	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;