Remove references to CImage.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@3749 dfc29bdd-3216-0410-991c-e03cc46cb475

source/Irrlicht/CGUIColorSelectDialog.cpp

@@ -15,7 +15,6 @@
 #include "IGUISpriteBank.h"
 #include "IFileList.h"
 #include "os.h"
-#include "CImage.h"
 #include "fast_atof.h"
 
 namespace irr
@@ -177,7 +176,9 @@ CGUIColorSelectDialog::~CGUIColorSelectDialog()
 void CGUIColorSelectDialog::buildColorRing( const core::dimension2d<u32> & dim, s32 supersample, const video::SColor& borderColor )
 {
 	const core::dimension2d<u32> d(dim.Width * supersample, dim.Height * supersample);
-	video::CImage *RawTexture = new video::CImage(video::ECF_A8R8G8B8, d);
+	video::IVideoDriver* driver = Environment->getVideoDriver();
+
+	video::IImage *RawTexture = driver->createImage(video::ECF_A8R8G8B8, d);
 
 	RawTexture->fill ( 0x00808080 );
 
@@ -270,14 +271,12 @@ void CGUIColorSelectDialog::buildColorRing( const core::dimension2d<u32> & dim,
 
 	if ( supersample > 1 )
 	{
-		video::CImage * filter = new video::CImage(video::ECF_A8R8G8B8, dim );
+		video::IImage * filter = driver->createImage(video::ECF_A8R8G8B8, dim );
 		RawTexture->copyToScalingBoxFilter(filter);
 		RawTexture->drop();
 		RawTexture = filter;
 	}
 
-	video::IVideoDriver* driver = Environment->getVideoDriver();
-
 	bool generateMipLevels = driver->getTextureCreationFlag(video::ETCF_CREATE_MIP_MAPS);
 	driver->setTextureCreationFlag( video::ETCF_CREATE_MIP_MAPS, false);
 

source/Irrlicht/CGUIFont.cpp

@@ -11,7 +11,6 @@
 #include "IReadFile.h"
 #include "IVideoDriver.h"
 #include "IGUISpriteBank.h"
-#include "CImage.h"
 
 namespace irr
 {
@@ -254,7 +253,7 @@ bool CGUIFont::loadTexture(video::IImage* image, const io::path& name)
 	switch(image->getColorFormat())
 	{
 	case video::ECF_R5G6B5:
-		tmpImage =  new video::CImage(video::ECF_A1R5G5B5,image->getDimension());
+		tmpImage =  Driver->createImage(video::ECF_A1R5G5B5,image->getDimension());
 		image->copyTo(tmpImage);
 		deleteTmpImage=true;
 		break;
@@ -262,7 +261,7 @@ bool CGUIFont::loadTexture(video::IImage* image, const io::path& name)
 	case video::ECF_A8R8G8B8:
 		break;
 	case video::ECF_R8G8B8:
-		tmpImage = new video::CImage(video::ECF_A8R8G8B8,image->getDimension());
+		tmpImage = Driver->createImage(video::ECF_A8R8G8B8,image->getDimension());
 		image->copyTo(tmpImage);
 		deleteTmpImage=true;
 		break;

source/Irrlicht/CGeometryCreator.cpp

@@ -8,7 +8,6 @@
 #include "SMesh.h"
 #include "IMesh.h"
 #include "IVideoDriver.h"
-#include "CImage.h"
 #include "os.h"
 
 namespace irr
@@ -265,7 +264,7 @@ IMesh* CGeometryCreator::createTerrainMesh(video::IImage* texture,
 			{
 				c8 textureName[64];
 				// create texture for this block
-				video::IImage* img = new video::CImage(texture->getColorFormat(), core::dimension2d<u32>(core::floor32(blockSize.Width*thRel.X), core::floor32(blockSize.Height*thRel.Y)));
+				video::IImage* img = driver->createImage(texture->getColorFormat(), core::dimension2d<u32>(core::floor32(blockSize.Width*thRel.X), core::floor32(blockSize.Height*thRel.Y)));
 				texture->copyTo(img, core::position2di(0,0), core::recti(
 					core::position2d<s32>(core::floor32(processed.X*thRel.X), core::floor32(processed.Y*thRel.Y)),
 					core::dimension2d<u32>(core::floor32(blockSize.Width*thRel.X), core::floor32(blockSize.Height*thRel.Y))), 0);

source/Irrlicht/COCTLoader.cpp

@@ -19,7 +19,6 @@
 #include "SAnimatedMesh.h"
 #include "SMeshBufferLightMap.h"
 #include "irrString.h"
-#include "CImage.h"
 #include "ISceneManager.h"
 
 namespace irr
@@ -224,7 +223,8 @@ IAnimatedMesh* COCTLoader::createMesh(io::IReadFile* file)
 	bool oldMipMapState = SceneManager->getVideoDriver()->getTextureCreationFlag(video::ETCF_CREATE_MIP_MAPS);
 	SceneManager->getVideoDriver()->setTextureCreationFlag(video::ETCF_CREATE_MIP_MAPS, false);
 
-	video::CImage tmpImage(video::ECF_R8G8B8, lmapsize);
+	video::IImage* tmpImage;
+	SceneManager->getVideoDriver()->createImage(video::ECF_R8G8B8, lmapsize);
 	for (i = 1; i < (header.numLightmaps + 1); ++i)
 	{
 		core::stringc lightmapname = file->getFileName();
@@ -237,7 +237,7 @@ IAnimatedMesh* COCTLoader::createMesh(io::IReadFile* file)
 		{
 			for (u32 y=0; y<lightmapHeight; ++y)
 			{
-				tmpImage.setPixel(x, y,
+				tmpImage->setPixel(x, y,
 						video::SColor(255,
 						lm->data[x][y][2],
 						lm->data[x][y][1],
@@ -245,8 +245,9 @@ IAnimatedMesh* COCTLoader::createMesh(io::IReadFile* file)
 			}
 		}
 
-		lig[i] = SceneManager->getVideoDriver()->addTexture(lightmapname.c_str(), &tmpImage);
+		lig[i] = SceneManager->getVideoDriver()->addTexture(lightmapname.c_str(), tmpImage);
 	}
+	tmpImage->drop();
 	SceneManager->getVideoDriver()->setTextureCreationFlag(video::ETCF_CREATE_MIP_MAPS, oldMipMapState);
 
 	// Free stuff

source/Irrlicht/COpenGLDriver.cpp

@@ -14,7 +14,6 @@
 #include "COpenGLSLMaterialRenderer.h"
 #include "COpenGLNormalMapRenderer.h"
 #include "COpenGLParallaxMapRenderer.h"
-#include "CImage.h"
 #include "os.h"
 
 #ifdef _IRR_COMPILE_WITH_SDL_DEVICE_
@@ -4272,7 +4271,7 @@ IImage* COpenGLDriver::createScreenShot(video::ECOLOR_FORMAT format, video::E_RE
 
 	if (format==video::ECF_UNKNOWN)
 		format=video::ECF_A8R8G8B8;
-	IImage* newImage = new CImage(format, ScreenSize);
+	IImage* newImage = createImage(format, ScreenSize);
 
 	u8* pixels = static_cast<u8*>(newImage->lock());
 	if (pixels)

source/Irrlicht/COpenGLTexture.cpp

@@ -10,7 +10,6 @@
 #include "COpenGLTexture.h"
 #include "COpenGLDriver.h"
 #include "os.h"
-#include "CImage.h"
 #include "CColorConverter.h"
 
 #include "irrString.h"
@@ -39,12 +38,12 @@ COpenGLTexture::COpenGLTexture(IImage* origImage, const io::path& name, void* mi
 
 	if (ImageSize==TextureSize)
 	{
-		Image = new CImage(ColorFormat, ImageSize);
+		Driver->createImage(ColorFormat, ImageSize);
 		origImage->copyTo(Image);
 	}
 	else
 	{
-		Image = new CImage(ColorFormat, TextureSize);
+		Driver->createImage(ColorFormat, TextureSize);
 		// scale texture
 		origImage->copyToScaling(Image);
 	}
@@ -402,10 +401,10 @@ void* COpenGLTexture::lock(E_TEXTURE_LOCK_MODE mode, u32 mipmapLevel)
 					++i;
 				}
 				while (i != mipmapLevel);
-				MipImage = image = new CImage(ECF_A8R8G8B8, core::dimension2du(width,height));
+				MipImage = image = Driver->createImage(ECF_A8R8G8B8, core::dimension2du(width,height));
 			}
 			else
-				Image = image = new CImage(ECF_A8R8G8B8, ImageSize);
+				Image = image = Driver->createImage(ECF_A8R8G8B8, ImageSize);
 			ColorFormat = ECF_A8R8G8B8;
 		}
 		if (!image)

source/Irrlicht/CSoftwareDriver.cpp

@@ -283,7 +283,7 @@ bool CSoftwareDriver::setRenderTarget(video::ITexture* texture, bool clearBackBu
 			ZBuffer->clear();
 
 		if (clearBackBuffer)
-			((video::CImage*)RenderTargetSurface)->fill( color );
+			RenderTargetSurface->fill(color);
 	}
 
 	return true;
@@ -903,7 +903,7 @@ ITexture* CSoftwareDriver::addRenderTargetTexture(const core::dimension2d<u32>&
 												  const io::path& name,
 												  const ECOLOR_FORMAT format)
 {
-	CImage* img = new CImage(video::ECF_A1R5G5B5, size);
+	IImage* img = createImage(video::ECF_A1R5G5B5, size);
 	ITexture* tex = new CSoftwareTexture(img, name, true);
 	img->drop();
 	addTexture(tex);
@@ -925,7 +925,7 @@ IImage* CSoftwareDriver::createScreenShot(video::ECOLOR_FORMAT format, video::E_
 {
 	if (BackBuffer)
 	{
-		CImage* tmp = new CImage(BackBuffer->getColorFormat(), BackBuffer->getDimension());
+		IImage* tmp = createImage(BackBuffer->getColorFormat(), BackBuffer->getDimension());
 		BackBuffer->copyTo(tmp);
 		return tmp;
 	}

source/Irrlicht/CSoftwareDriver2.cpp

@@ -2566,7 +2566,7 @@ const core::matrix4& CBurningVideoDriver::getTransform(E_TRANSFORMATION_STATE st
 ITexture* CBurningVideoDriver::addRenderTargetTexture(const core::dimension2d<u32>& size,
 		const io::path& name, const ECOLOR_FORMAT format)
 {
-	CImage* img = new CImage(BURNINGSHADER_COLOR_FORMAT, size);
+	IImage* img = createImage(BURNINGSHADER_COLOR_FORMAT, size);
 	ITexture* tex = new CSoftwareTexture2(img, name, CSoftwareTexture2::IS_RENDERTARGET );
 	img->drop();
 	addTexture(tex);
@@ -2588,7 +2588,7 @@ IImage* CBurningVideoDriver::createScreenShot(video::ECOLOR_FORMAT format, video
 {
 	if (BackBuffer)
 	{
-		CImage* tmp = new CImage(BackBuffer->getColorFormat(), BackBuffer->getDimension());
+		IImage* tmp = createImage(BackBuffer->getColorFormat(), BackBuffer->getDimension());
 		BackBuffer->copyTo(tmp);
 		return tmp;
 	}