Removed EncodedImageData, added three new encoded image formats, and changed the way screenshots work - saving screenshots will be broken until we have some way of flipping ImageData, though

--HG--
branch : minor

src/modules/image/EncodedImageData.cpp

@@ -1,77 +0,0 @@
-/**
- * Copyright (c) 2006-2011 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
- *    appreciated but is not required.
- * 2. Altered source versions must be plainly marked as such, and must not be
- *    misrepresented as being the original software.
- * 3. This notice may not be removed or altered from any source distribution.
- **/
-
-#include "EncodedImageData.h"
-
-namespace love
-{
-namespace image
-{
-	EncodedImageData::EncodedImageData(void * d, Format f, int s)
-		: data(d), size(s), format(f), freeData(0)
-	{
-	}
-
-	EncodedImageData::EncodedImageData(void * d, Format f, int s, void (*freeData)(void*))
-		: data(d), size(s), format(f), freeData(freeData)
-	{
-	}
-
-	EncodedImageData::~EncodedImageData()
-	{
-		if (freeData != 0)
-			freeData(data);
-	}
-
-	void * EncodedImageData::getData() const
-	{
-		return data;
-	}
-
-	EncodedImageData::Format EncodedImageData::getFormat() const
-	{
-		return format;
-	}
-
-	int EncodedImageData::getSize() const
-	{
-		return size;
-	}
-
-	bool EncodedImageData::getConstant(const char * in, EncodedImageData::Format & out)
-	{
-		return formats.find(in, out);
-	}
-
-	bool EncodedImageData::getConstant(EncodedImageData::Format in, const char *& out)
-	{
-		return formats.find(in, out);
-	}
-
-	StringMap<EncodedImageData::Format, EncodedImageData::FORMAT_MAX_ENUM>::Entry EncodedImageData::formatEntries[] =
-	{
-		{"tga", EncodedImageData::FORMAT_TGA},
-		{"bmp", EncodedImageData::FORMAT_BMP},
-	};
-
-	StringMap<EncodedImageData::Format, EncodedImageData::FORMAT_MAX_ENUM> EncodedImageData::formats(EncodedImageData::formatEntries, sizeof(EncodedImageData::formatEntries));
-
-} // image
-} // love

src/modules/image/EncodedImageData.h

@@ -1,96 +0,0 @@
-/**
- * Copyright (c) 2006-2011 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
- *    appreciated but is not required.
- * 2. Altered source versions must be plainly marked as such, and must not be
- *    misrepresented as being the original software.
- * 3. This notice may not be removed or altered from any source distribution.
- **/
-
-#ifndef LOVE_IMAGE_ENCODED_IMAGE_DATA_H
-#define LOVE_IMAGE_ENCODED_IMAGE_DATA_H
-
-// LOVE
-#include <common/Data.h>
-#include <common/StringMap.h>
-
-namespace love
-{
-namespace image
-{
-	/**
-	 * Represents encoded pixel data.
-	 **/
-	class EncodedImageData : public Data
-	{
-	public:
-
-		enum Format
-		{
-			FORMAT_TGA = 1,
-			FORMAT_BMP,
-			FORMAT_MAX_ENUM
-		};
-
-		/**
-		* Constructor.
-		**/
-		EncodedImageData(void * data, Format format, int size);
-		EncodedImageData(void * data, Format format, int size, void (*freeData)(void*));
-
-		/**
-		* Destructor.
-		**/
-		virtual ~EncodedImageData();
-
-		// Implements Data.
-		void * getData() const;
-		int getSize() const;
-
-		/**
-		* Get the format the data is encoded in.
-		**/
-		Format getFormat() const;
-
-		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.
-		 **/
-		Format format;
-
-		static StringMap<Format, FORMAT_MAX_ENUM>::Entry formatEntries[];
-		static StringMap<Format, FORMAT_MAX_ENUM> formats;
-
-		void (*freeData)(void *data);
-
-	}; // EncodedImageData
-
-} // image
-} // love
-
-#endif // LOVE_IMAGE_ENCODED_IMAGE_DATA_H

src/modules/image/ImageData.cpp

@@ -45,6 +45,27 @@ namespace image
 	{
 		return (x >= 0 && x < getWidth() && y >= 0 && y < getHeight());
 	}
+	
+	bool ImageData::getConstant(const char * in, ImageData::Format & out)
+	{
+		return formats.find(in, out);
+	}
+	
+	bool ImageData::getConstant(ImageData::Format in, const char *& out)
+	{
+		return formats.find(in, out);
+	}
+	
+	StringMap<ImageData::Format, ImageData::FORMAT_MAX_ENUM>::Entry ImageData::formatEntries[] =
+	{
+		{"tga", ImageData::FORMAT_TGA},
+		{"bmp", ImageData::FORMAT_BMP},
+		{"gif", ImageData::FORMAT_GIF},
+		{"jpg", ImageData::FORMAT_JPG},
+		{"png", ImageData::FORMAT_PNG},
+	};
+	
+	StringMap<ImageData::Format, ImageData::FORMAT_MAX_ENUM> ImageData::formats(ImageData::formatEntries, sizeof(ImageData::formatEntries));
 
 } // image
 } // love

src/modules/image/ImageData.h

@@ -23,8 +23,7 @@
 
 // LOVE
 #include <common/Data.h>
-
-#include "EncodedImageData.h"
+#include <filesystem/File.h>
 
 namespace love
 {	
@@ -43,11 +42,24 @@ namespace image
 	class ImageData : public Data
 	{
 	public:
+		
+		enum Format
+		{
+			FORMAT_TGA = 1,
+			FORMAT_BMP,
+			FORMAT_GIF,
+			FORMAT_JPG,
+			FORMAT_PNG,
+			FORMAT_MAX_ENUM
+		};
 
 		/**
 		* Destructor.
 		**/
 		virtual ~ImageData(){};
+		
+		static bool getConstant(const char * in, Format & out);
+		static bool getConstant(Format in, const char *& out);
 
 		/**
 		* Paste part of one ImageData onto another. The subregion defined by the top-left
@@ -102,7 +114,11 @@ namespace image
 		 * @param f The format to convert to.
 		 * @return A pointer to the encoded image data.
 		 **/
-		virtual EncodedImageData * encode(EncodedImageData::Format f) = 0;
+		virtual void encode(love::filesystem::File * f, Format format) = 0;
+		
+	private:
+		static StringMap<Format, FORMAT_MAX_ENUM>::Entry formatEntries[];
+		static StringMap<Format, FORMAT_MAX_ENUM> formats;
 
 	}; // ImageData
 

src/modules/image/devil/ImageData.cpp

@@ -25,6 +25,7 @@
 
 // LOVE
 #include <common/Exception.h>
+#include <filesystem/File.h>
 
 namespace love
 {
@@ -170,106 +171,34 @@ namespace devil
 		return pixels[y*width+x];
 	}
 
-	EncodedImageData * ImageData::encode(EncodedImageData::Format f) {
+	void ImageData::encode(love::filesystem::File * f, ImageData::Format format) {
 		ilBindImage(image);
-		ILubyte * data;
-		ILuint w = getWidth();
-		int h = getHeight(); // has to be a signed int so we can make it negative for BMPs
-		int headerLen, bpp, row, size, padding, filesize;
-		switch (f) {
-			case EncodedImageData::FORMAT_BMP:
-				headerLen = 54;
-				bpp = 3;
-				row = w * bpp;
-				padding = row & 3;
-				size = h * (row + padding);
-				filesize = size + headerLen;
-				data = new ILubyte[filesize];
-				// Here's the header for the BMP file format.
-				data[0] = 66; // "B"
-				data[1] = 77; // "M"
-				data[2] = filesize & 255; // size of the file
-				data[3] = (filesize >> 8) & 255;
-				data[4] = (filesize >> 16) & 255;
-				data[5] = (filesize >> 24) & 255;
-				data[6] = data[7] = data[8] = data[9] = 0; // useless reserved values
-				data[10] = headerLen; // offset where pixel data begins
-				data[11] = (headerLen >> 8) & 255;
-				data[12] = (headerLen >> 16) & 255;
-				data[13] = (headerLen >> 24) & 255;
-				data[14] = headerLen - 14; // length of this part of the header
-				data[15] = ((headerLen - 14) >> 8) & 255;
-				data[16] = ((headerLen - 14) >> 16) & 255;
-				data[17] = ((headerLen - 14) >> 24) & 255;
-				data[18] = w & 255; // width of the bitmap
-				data[19] = (w >> 8) & 255;
-				data[20] = (w >> 16) & 255;
-				data[21] = (w >> 24) & 255;
-				data[22] = -h & 255; // negative height of the bitmap - used so we don't have to flip the data
-				data[23] = ((-h) >> 8) & 255;
-				data[24] = ((-h) >> 16) & 255;
-				data[25] = ((-h) >> 24) & 255;
-				data[26] = 1; // number of color planes
-				data[27] = 0;
-				data[28] = bpp * 8; // bits per pixel
-				data[29] = 0;
-				data[30] = data[31] = data[32] = data[33] = 0; // RGB - no compression
-				data[34] = (row + padding) * h; // length of the pixel data
-				data[35] = (((row + padding) * h) >> 8) & 255;
-				data[36] = (((row + padding) * h) >> 16) & 255;
-				data[37] = (((row + padding) * h) >> 24) & 255;
-				data[38] = 2835 & 255; // horizontal pixels per meter
-				data[39] = (2835 >> 8) & 255;
-				data[40] = (2835 >> 16) & 255;
-				data[41] = (2835 >> 24) & 255;
-				data[42] = 2835 & 255; // vertical pixels per meter
-				data[43] = data[39];
-				data[44] = data[40];
-				data[45] = data[41];
-				data[46] = data[47] = data[48] = data[49] = 0; // number of colors in the palette
-				data[50] = data[51] = data[52] = data[53] = 0; // all colors are important!
-				// Okay, header's done! Now for the pixel data...
-				data += headerLen;
-				for (int i = 0; i < h; i++) { // we've got to loop through the rows, adding the pixel data plus padding
-					ilCopyPixels(0,i,0,w,1,1,IL_BGR,IL_UNSIGNED_BYTE,data);
-					data += row;
-				}
-				data -= filesize;
+		ILuint ilFormat;
+		switch (format) {
+			case ImageData::FORMAT_BMP:
+				ilFormat = IL_BMP;
+				break;
+			case ImageData::FORMAT_TGA:
+				ilFormat = IL_TGA;
+				break;
+			case ImageData::FORMAT_GIF:
+				ilFormat = IL_GIF;
+				break;
+			case ImageData::FORMAT_JPG:
+				ilFormat = IL_JPG;
+				break;
+			case ImageData::FORMAT_PNG:
+			default: // PNG is the default format
+				ilFormat = IL_PNG;
 				break;
-			case EncodedImageData::FORMAT_TGA:
-			default: // TGA is the default format
-				headerLen = 18;
-				bpp = 4;
-				size = h * w * bpp;
-				data = new ILubyte[size + headerLen];
-				// here's the header for the Targa file format.
-				data[0] = 0; // ID field size
-				data[1] = 0; // colormap type
-				data[2] = 2; // image type
-				data[3] = data[4] = 0; // colormap start
-				data[5] = data[6] = 0; // colormap length
-				data[7] = 32; // colormap bits
-				data[8] = data[9] = 0; // x origin
-				data[10] = data[11] = 0; // y origin
-				// Targa is little endian, so:
-				data[12] = w & 255; // least significant byte of width
-				data[13] = w >> 8; // most significant byte of width
-				data[14] = h & 255; // least significant byte of height
-				data[15] = h >> 8; // most significant byte of height
-				data[16] = bpp * 8; // bits per pixel
-				data[17] = 0x20; // descriptor bits (flip bits: 0x10 horizontal, 0x20 vertical)
-				// header done. write the pixel data to TGA:
-				data += headerLen;
-				ilCopyPixels(0,0,0,w,h,1,IL_BGRA,IL_UNSIGNED_BYTE,data); // convert the pixels to BGRA (remember, little-endian) and copy them to data
-
-				data -= headerLen;
 		}
-		return new EncodedImageData(data, f, size + headerLen, freeData);
-	}
-
-	void ImageData::freeData(void *data)
-	{
-		delete[] (ILubyte*) data;
+		ILuint size = ilSaveL(ilFormat, NULL, 0);
+		ILubyte * data = new ILubyte[size];
+		ilSaveL(ilFormat, data, size);
+		f->open(love::filesystem::File::WRITE);
+		f->write(data, size);
+		f->close();
+		delete[] data;
 	}
 
 } // devil

src/modules/image/devil/ImageData.h

@@ -25,7 +25,6 @@
 #include <filesystem/File.h>
 #include <image/Image.h>
 #include <image/ImageData.h>
-#include <image/EncodedImageData.h>
 
 // DevIL
 #include <IL/il.h>
@@ -77,9 +76,7 @@ namespace devil
 		int getHeight() const ;
 		void setPixel(int x, int y, pixel c);
 		pixel getPixel(int x, int y) const;
-		EncodedImageData * encode(EncodedImageData::Format f);
-
-		static void freeData(void *data);
+		void encode(love::filesystem::File * f, Format format);
 
 	}; // ImageData
 

src/modules/image/devil/wrap_Image.cpp

@@ -19,8 +19,6 @@
 **/
 
 #include "wrap_Image.h"
-#include "image/EncodedImageData.h"
-#include "image/wrap_EncodedImageData.h"
 
 namespace love
 {
@@ -33,13 +31,11 @@ namespace devil
 	// List of functions to wrap.
 	static const luaL_Reg functions[] = {
 		{ "newImageData",  w_newImageData },
-		{ "newEncodedImageData", w_newEncodedImageData },
 		{ 0, 0 }
 	};
 
 	static const lua_CFunction types[] = {
 		luaopen_imagedata,
-		luaopen_encodedimagedata,
 		0
 	};
 	

src/modules/image/wrap_EncodedImageData.cpp

@@ -1,59 +0,0 @@
-/**
-* Copyright (c) 2006-2011 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
-*    appreciated but is not required.
-* 2. Altered source versions must be plainly marked as such, and must not be
-*    misrepresented as being the original software.
-* 3. This notice may not be removed or altered from any source distribution.
-**/
-
-#include "wrap_ImageData.h"
-
-#include <common/wrap_Data.h>
-
-namespace love
-{
-namespace image
-{
-	EncodedImageData * luax_checkencodedimagedata(lua_State * L, int idx)
-	{
-		return luax_checktype<EncodedImageData>(L, idx, "EncodedImageData", IMAGE_ENCODED_IMAGE_DATA_T);
-	}
-	
-	int w_EncodedImageData_getFormat(lua_State * L) {
-		EncodedImageData * e = luax_checkencodedimagedata(L, 1);
-		EncodedImageData::Format f = e->getFormat();
-		const char * fmt;
-		EncodedImageData::getConstant(f, fmt);
-		lua_pushstring(L, fmt);
-		return 1;
-	}
-
-	static const luaL_Reg functions[] = {
-
-		// Data
-		{ "getPointer", w_Data_getPointer },
-		{ "getSize", w_Data_getSize },
-
-		{ "getFormat", w_EncodedImageData_getFormat },
-		{ 0, 0 }
-	};
-
-	int luaopen_encodedimagedata(lua_State * L)
-	{
-		return luax_register_type(L, "EncodedImageData", functions);
-	}
-
-} // image
-} // love

src/modules/image/wrap_EncodedImageData.h

@@ -1,40 +0,0 @@
-/**
-* Copyright (c) 2006-2011 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
-*    appreciated but is not required.
-* 2. Altered source versions must be plainly marked as such, and must not be
-*    misrepresented as being the original software.
-* 3. This notice may not be removed or altered from any source distribution.
-**/
-
-#ifndef LOVE_IMAGE_WRAP_ENCODED_IMAGE_DATA_H
-#define LOVE_IMAGE_WRAP_ENCODED_IMAGE_DATA_H
-
-// LOVE
-#include <common/runtime.h>
-#include "ImageData.h"
-
-namespace love
-{
-namespace image
-{
-	EncodedImageData * luax_checkencodedimagedata(lua_State * L, int idx);
-	
-	int w_EncodedImageData_getFormat(lua_State * L);
-	int luaopen_encodedimagedata(lua_State * L);
-
-} // image
-} // love
-
-#endif // LOVE_IMAGE_WRAP_ENCODED_IMAGE_DATA_H

src/modules/image/wrap_Image.cpp

@@ -20,9 +20,6 @@
 
 #include "wrap_Image.h"
 
-#include "EncodedImageData.h"
-#include "wrap_EncodedImageData.h"
-
 #include <common/Data.h>
 #include <common/StringMap.h>
 
@@ -77,15 +74,5 @@ namespace image
 		return 1;
 	}
 
-	int w_newEncodedImageData(lua_State * L) {
-		ImageData * t = luax_checkimagedata(L, 1);
-		const char * fmt = luaL_checkstring(L, 2);
-		EncodedImageData::Format f;
-		EncodedImageData::getConstant(fmt, f);
-		EncodedImageData * eid = t->encode(f);
-		luax_newtype(L, "EncodedImageData", IMAGE_ENCODED_IMAGE_DATA_T, (void*)eid);
-		return 1;
-	}
-
 } // image
 } // love

src/modules/image/wrap_Image.h

@@ -31,7 +31,6 @@ namespace image
 {
 	int w_getFormats(lua_State * L);
 	int w_newImageData(lua_State * L);
-	int w_newEncodedImageData(lua_State * L);
 	extern "C" LOVE_EXPORT int luaopen_love_image(lua_State * L);
 
 } // image

src/modules/image/wrap_ImageData.cpp

@@ -21,6 +21,7 @@
 #include "wrap_ImageData.h"
 
 #include <common/wrap_Data.h>
+#include <filesystem/File.h>
 
 namespace love
 {
@@ -130,12 +131,19 @@ namespace image
 	int w_ImageData_encode(lua_State * L)
 	{
 		ImageData * t = luax_checkimagedata(L, 1);
-		const char * fmt = luaL_checkstring(L, 2);
-		EncodedImageData::Format f;
-		EncodedImageData::getConstant(fmt, f);
-		EncodedImageData * eid = t->encode(f);
-		luax_newtype(L, "EncodedImageData", IMAGE_ENCODED_IMAGE_DATA_T, (void*)eid);
-		return 1;
+		if(lua_isstring(L, 2))
+			luax_convobj(L, 2, "filesystem", "newFile");
+		love::filesystem::File * file = luax_checktype<love::filesystem::File>(L, 2, "File", FILESYSTEM_FILE_T);
+		const char * fmt;
+		if (lua_isnoneornil(L, 3)) {
+			fmt = file->getExtension().c_str();
+		} else {
+			fmt = luaL_checkstring(L, 3);
+		}
+		ImageData::Format format;
+		ImageData::getConstant(fmt, format);
+		t->encode(file, format);
+		return 0;
 	}
 
 	static const luaL_Reg functions[] = {