Do some core::dimension2di() conversions required when passing...

Do some core::dimension2di() conversions required when passing dimension2d<u32> sources as dimension2d<s32> parameters. 

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

source/Irrlicht/CGUIColorSelectDialog.h

@@ -67,7 +67,7 @@ namespace gui
 		};
 		SColorCircle ColorRing;
 
-		void buildColorRing( const core::dimension2d<s32> & dim, s32 supersample, const u32 borderColor );
+		void buildColorRing( const core::dimension2d<u32> & dim, s32 supersample, const u32 borderColor );
 	};
 
 

source/Irrlicht/CGUIEnvironment.cpp

@@ -922,7 +922,7 @@ void CGUIEnvironment::deserializeAttributes(io::IAttributes* in, io::SAttributeR
 
 	RelativeRect = AbsoluteRect =
 			core::rect<s32>(core::position2d<s32>(0,0),
-					Driver ? Driver->getScreenSize() : core::dimension2d<s32>(0,0));
+			Driver ? core::dimension2di(Driver->getScreenSize()) : core::dimension2d<s32>(0,0));
 }
 
 
@@ -1265,7 +1265,7 @@ IGUIInOutFader* CGUIEnvironment::addInOutFader(const core::rect<s32>* rectangle,
 	if (rectangle)
 		rect = *rectangle;
 	else if (Driver)
-		rect = core::rect<s32>(core::position2d<s32>(0,0), Driver->getScreenSize());
+		rect = core::rect<s32>(core::position2d<s32>(0,0), core::dimension2di(Driver->getScreenSize()));
 
 	if (!parent)
 		parent = this;

source/Irrlicht/CGUIImage.cpp

@@ -75,13 +75,13 @@ void CGUIImage::draw()
 			const video::SColor Colors[] = {Color,Color,Color,Color};
 
 			driver->draw2DImage(Texture, AbsoluteRect,
-				core::rect<s32>(core::position2d<s32>(0,0), Texture->getOriginalSize()),
+				core::rect<s32>(core::position2d<s32>(0,0), core::dimension2di(Texture->getOriginalSize())),
 				&AbsoluteClippingRect, Colors, UseAlphaChannel);
 		}
 		else
 		{
 			driver->draw2DImage(Texture, AbsoluteRect.UpperLeftCorner,
-				core::rect<s32>(core::position2d<s32>(0,0), Texture->getOriginalSize()),
+				core::rect<s32>(core::position2d<s32>(0,0), core::dimension2di(Texture->getOriginalSize())),
 				&AbsoluteClippingRect, Color, UseAlphaChannel);
 		}
 	}

tests/tests-last-passed-at.txt

-Test suite pass at GMT Thu Jan 22 10:10:45 2009
+Test suite pass at GMT Thu Jan 22 12:59:05 2009