X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fvertexarraybuilder.cpp;h=f9adcf582ac197dd951dee643f35d6bc8a2edbb5;hb=ceae2a27dfc58310c5bab7e3aa3fedf0fa9a1f49;hp=09b0a1f2a85655e21e3f87b15525a7f8ac87d756;hpb=8f2430208cfa7bb9dc5bd655dde88acc21db54d2;p=libs%2Fgl.git

diff --git a/source/vertexarraybuilder.cpp b/source/vertexarraybuilder.cpp
index 09b0a1f2..f9adcf58 100644
--- a/source/vertexarraybuilder.cpp
+++ b/source/vertexarraybuilder.cpp
@@ -25,8 +25,8 @@ void VertexArrayBuilder::vertex_(float x, float y, float z, float w)
 	float *ptr=array.append();
 	for(const unsigned char *c=array.get_format().begin(); c!=array.get_format().end(); ++c)
 	{
-		uint size=(*c&3)+1;
-		uint type=*c>>2;
+		unsigned size=(*c&3)+1;
+		unsigned type=*c>>2;
 		switch(type)
 		{
 		case 0:
@@ -49,11 +49,11 @@ void VertexArrayBuilder::vertex_(float x, float y, float z, float w)
 		case 3:
 			if(size==1)
 			{
-				union { ubyte c[4]; float f; } u;
-				u.c[0]=static_cast<ubyte>(cr*255);
-				u.c[1]=static_cast<ubyte>(cg*255);
-				u.c[2]=static_cast<ubyte>(cb*255);
-				u.c[3]=static_cast<ubyte>(ca*255);
+				union { unsigned char c[4]; float f; } u;
+				u.c[0]=static_cast<unsigned char>(cr*255);
+				u.c[1]=static_cast<unsigned char>(cg*255);
+				u.c[2]=static_cast<unsigned char>(cb*255);
+				u.c[3]=static_cast<unsigned char>(ca*255);
 				*ptr++=u.f;
 			}
 			else