Fixed the getSize confusion and the wrongly comitted profiling option in the makefile.

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

source/Irrlicht/COpenGLTexture.cpp

@@ -158,17 +158,10 @@ COpenGLTexture::~COpenGLTexture()
 		glDeleteTextures(1, &DepthRenderBuffer);
 	if (StencilRenderBuffer && StencilRenderBuffer != DepthRenderBuffer)
 		glDeleteTextures(1, &StencilRenderBuffer);
-	ColorFrameBuffer = 0;
-	DepthRenderBuffer = 0;
-	StencilRenderBuffer = 0;
 
 	glDeleteTextures(1, &TextureName);
 	if (Image)
-	{
 		Image->drop();
-		Image=0;
-	}
-	ImageSize.Width=ImageSize.Height=0;
 }
 
 
@@ -346,21 +339,21 @@ void COpenGLTexture::unlock()
 
 
 
-//! Returns original size of the texture.
+//! Returns size of the original image.
 const core::dimension2d<s32>& COpenGLTexture::getOriginalSize()
 {
-	if (Image)
-		return Image->getDimension();
-	else
-		return ImageSize;
+	return ImageSize;
 }
 
 
 
-//! Returns (=size) of the texture.
+//! Returns of the texture.
 const core::dimension2d<s32>& COpenGLTexture::getSize()
 {
-	return ImageSize;
+	if (Image)
+		return Image->getDimension();
+	else
+		return ImageSize;
 }
 
 

source/Irrlicht/Makefile

@@ -38,7 +38,7 @@ CXXINCS = -I../../include -Izlib -Ijpeglib -Ilibpng
 CPPFLAGS = $(CXXINCS) -DIRRLICHT_EXPORTS=1
 CXXFLAGS = -Wall
 ifndef NDEBUG
-CXXFLAGS += -pg
+CXXFLAGS += -g
 else
 CXXFLAGS += -fexpensive-optimizations -O3
 endif