[Scummvm-cvs-logs] SF.net SVN: scummvm:[33103] residual/trunk/engine/tinygl

[aquadran at users.sourceforge.net]

Revision: 33103
          http://scummvm.svn.sourceforge.net/scummvm/?rev=33103&view=rev
Author:   aquadran
Date:     2008-07-18 21:36:40 +0000 (Fri, 18 Jul 2008)

Log Message:
-----------
long -> int potentialy 64 bit issues

Modified Paths:
--------------
    residual/trunk/engine/tinygl/zbuffer.cpp
    residual/trunk/engine/tinygl/zbuffer.h
    residual/trunk/engine/tinygl/zline.cpp
    residual/trunk/engine/tinygl/zline.h
    residual/trunk/engine/tinygl/ztriangle.cpp
    residual/trunk/engine/tinygl/ztriangle.h
    residual/trunk/engine/tinygl/ztriangle_shadow.cpp

Modified: residual/trunk/engine/tinygl/zbuffer.cpp
===================================================================
--- residual/trunk/engine/tinygl/zbuffer.cpp	2008-07-18 20:52:11 UTC (rev 33102)
+++ residual/trunk/engine/tinygl/zbuffer.cpp	2008-07-18 21:36:40 UTC (rev 33103)
@@ -34,9 +34,9 @@
 	if (zb->zbuf == NULL)
 		goto error;
 
-	size = zb->xsize * zb->ysize * sizeof(unsigned long);
+	size = zb->xsize * zb->ysize * sizeof(unsigned int);
 
-	zb->zbuf2 = (unsigned long *)gl_malloc(size);
+	zb->zbuf2 = (unsigned int *)gl_malloc(size);
 	if (zb->zbuf2 == NULL) {
 		gl_free(zb->zbuf);
 		goto error;
@@ -87,10 +87,10 @@
 	gl_free(zb->zbuf);
 	zb->zbuf = (unsigned short *)gl_malloc(size);
 
-	size = zb->xsize * zb->ysize * sizeof(unsigned long);
+	size = zb->xsize * zb->ysize * sizeof(unsigned int);
 
 	gl_free(zb->zbuf2);
-	zb->zbuf2 = (unsigned long *)gl_malloc(size);
+	zb->zbuf2 = (unsigned int *)gl_malloc(size);
 
 	if (zb->frame_buffer_allocated)
 		gl_free(zb->pbuf);

Modified: residual/trunk/engine/tinygl/zbuffer.h
===================================================================
--- residual/trunk/engine/tinygl/zbuffer.h	2008-07-18 20:52:11 UTC (rev 33102)
+++ residual/trunk/engine/tinygl/zbuffer.h	2008-07-18 21:36:40 UTC (rev 33103)
@@ -34,7 +34,7 @@
 	int mode;
 
 	unsigned short *zbuf;
-	unsigned long *zbuf2;
+	unsigned int *zbuf2;
 	unsigned char *shadow_mask_buf;
 	int shadow_color_r;
 	int shadow_color_g;

Modified: residual/trunk/engine/tinygl/zline.cpp
===================================================================
--- residual/trunk/engine/tinygl/zline.cpp	2008-07-18 20:52:11 UTC (rev 33102)
+++ residual/trunk/engine/tinygl/zline.cpp	2008-07-18 21:36:40 UTC (rev 33103)
@@ -6,7 +6,7 @@
 
 void ZB_plot(ZBuffer * zb, ZBufferPoint * p) {
 	unsigned short *pz;
-	unsigned long *pz_2;
+	unsigned int *pz_2;
 	PIXEL *pp;
 	unsigned int zz;
 

Modified: residual/trunk/engine/tinygl/zline.h
===================================================================
--- residual/trunk/engine/tinygl/zline.h	2008-07-18 20:52:11 UTC (rev 33102)
+++ residual/trunk/engine/tinygl/zline.h	2008-07-18 21:36:40 UTC (rev 33103)
@@ -10,7 +10,7 @@
 #endif
 #ifdef INTERP_Z
 	register unsigned short *pz;
-	register unsigned long *pz_2;
+	register unsigned int *pz_2;
 	int zinc;
 	register unsigned int z, zz;
 #endif

Modified: residual/trunk/engine/tinygl/ztriangle.cpp
===================================================================
--- residual/trunk/engine/tinygl/ztriangle.cpp	2008-07-18 20:52:11 UTC (rev 33102)
+++ residual/trunk/engine/tinygl/ztriangle.cpp	2008-07-18 21:36:40 UTC (rev 33103)
@@ -58,7 +58,7 @@
 
 #define DRAW_LINE()	{								\
 	register unsigned short *pz;					\
-	register unsigned long *pz_2;					\
+	register unsigned int *pz_2;					\
 	register PIXEL *pp;								\
 	register unsigned int tmp, z, zz, rgb, drgbdx;	\
 	register int n;									\
@@ -133,7 +133,7 @@
 	ZBufferPoint *t, *pr1 = 0, *pr2 = 0, *l1 = 0, *l2 = 0;
 	float fdx1, fdx2, fdy1, fdy2, fz, d1, d2;
 	unsigned short *pz1;
-	unsigned long *pz2;
+	unsigned int *pz2;
 	PIXEL *pp1;
 	int part, update_left, update_right;
 
@@ -338,7 +338,7 @@
 			nb_lines--;
 			{
 				register unsigned short *pz;
-				register unsigned long *pz_2;
+				register unsigned int *pz_2;
 				register PIXEL *pp;
 				register unsigned int s, t, z, zz, rgb, drgbdx;
 				register int n, dsdx, dtdx;

Modified: residual/trunk/engine/tinygl/ztriangle.h
===================================================================
--- residual/trunk/engine/tinygl/ztriangle.h	2008-07-18 20:52:11 UTC (rev 33102)
+++ residual/trunk/engine/tinygl/ztriangle.h	2008-07-18 21:36:40 UTC (rev 33103)
@@ -5,7 +5,7 @@
 	ZBufferPoint *t, *pr1 = 0, *pr2 = 0, *l1 = 0, *l2 = 0;
 	float fdx1, fdx2, fdy1, fdy2, fz, d1, d2;
 	unsigned short *pz1;
-	unsigned long *pz2;
+	unsigned int *pz2;
 	PIXEL *pp1;
 	int part, update_left, update_right;
 
@@ -248,7 +248,7 @@
 				register int n;
 #ifdef INTERP_Z
 				register unsigned short *pz;
-				register unsigned long *pz_2;
+				register unsigned int *pz_2;
 				register unsigned int z, zz;
 #endif
 #ifdef INTERP_RGB

Modified: residual/trunk/engine/tinygl/ztriangle_shadow.cpp
===================================================================
--- residual/trunk/engine/tinygl/ztriangle_shadow.cpp	2008-07-18 20:52:11 UTC (rev 33102)
+++ residual/trunk/engine/tinygl/ztriangle_shadow.cpp	2008-07-18 21:36:40 UTC (rev 33103)
@@ -164,7 +164,7 @@
 	float fdx1, fdx2, fdy1, fdy2, fz, d1, d2;
 	unsigned char *pm1;
 	unsigned short *pz1;
-	unsigned long *pz2;
+	unsigned int *pz2;
 	PIXEL *pp1;
 	int part, update_left, update_right;
 
@@ -302,7 +302,7 @@
 				register unsigned char *pm;
 				register int n;
 				register unsigned short *pz;
-				register unsigned long *pz_2;
+				register unsigned int *pz_2;
 				register unsigned int z, zz;
 
 				n = (x2 >> 16) - x1;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.