mirror of
https://github.com/love2d/love.git
synced 2026-08-16 08:11:02 +02:00
Fixed memory leak in EncodedImageData, thanks Michael R
This commit is contained in:
@@ -1,14 +1,14 @@
|
||||
/**
|
||||
* Copyright (c) 2006-2010 LOVE Development Team
|
||||
*
|
||||
*
|
||||
* This software is provided 'as-is', without any express or implied
|
||||
* warranty. In no event will the authors be held liable for any damages
|
||||
* arising from the use of this software.
|
||||
*
|
||||
*
|
||||
* Permission is granted to anyone to use this software for any purpose,
|
||||
* including commercial applications, and to alter it and redistribute it
|
||||
* freely, subject to the following restrictions:
|
||||
*
|
||||
*
|
||||
* 1. The origin of this software must not be misrepresented; you must not
|
||||
* claim that you wrote the original software. If you use this software
|
||||
* in a product, an acknowledgment in the product documentation would be
|
||||
@@ -26,17 +26,17 @@
|
||||
#include <common/StringMap.h>
|
||||
|
||||
namespace love
|
||||
{
|
||||
{
|
||||
namespace image
|
||||
{
|
||||
/**
|
||||
* Represents encoded pixel data.
|
||||
* Represents encoded pixel data.
|
||||
**/
|
||||
class EncodedImageData : public Data
|
||||
{
|
||||
public:
|
||||
|
||||
enum Format
|
||||
|
||||
enum Format
|
||||
{
|
||||
FORMAT_TGA = 1,
|
||||
FORMAT_BMP,
|
||||
@@ -47,16 +47,17 @@ namespace image
|
||||
* Constructor.
|
||||
**/
|
||||
EncodedImageData(void * data, Format format, int size);
|
||||
|
||||
EncodedImageData(void * data, Format format, int size, void (*freeData)(void*));
|
||||
|
||||
/**
|
||||
* Destructor.
|
||||
**/
|
||||
virtual ~EncodedImageData(){};
|
||||
|
||||
virtual ~EncodedImageData();
|
||||
|
||||
// Implements Data.
|
||||
void * getData() const;
|
||||
int getSize() const;
|
||||
|
||||
|
||||
/**
|
||||
* Get the format the data is encoded in.
|
||||
**/
|
||||
@@ -64,19 +65,19 @@ namespace image
|
||||
|
||||
static bool getConstant(const char * in, Format & out);
|
||||
static bool getConstant(Format in, const char *& out);
|
||||
|
||||
|
||||
private:
|
||||
|
||||
|
||||
/**
|
||||
* Actual data.
|
||||
**/
|
||||
void * data;
|
||||
|
||||
|
||||
/**
|
||||
* Size of the data.
|
||||
**/
|
||||
int size;
|
||||
|
||||
|
||||
/**
|
||||
* Image format.
|
||||
**/
|
||||
@@ -84,9 +85,11 @@ namespace image
|
||||
|
||||
static StringMap<Format, FORMAT_MAX_ENUM>::Entry formatEntries[];
|
||||
static StringMap<Format, FORMAT_MAX_ENUM> formats;
|
||||
|
||||
|
||||
void (*freeData)(void *data);
|
||||
|
||||
}; // EncodedImageData
|
||||
|
||||
|
||||
} // image
|
||||
} // love
|
||||
|
||||
|
||||
Reference in New Issue
Block a user