[Scummvm-cvs-logs] SF.net SVN: scummvm:[48291] scummvm/trunk/graphics/VectorRendererSpec.cpp

[lordhoto at users.sourceforge.net]

Revision: 48291
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48291&view=rev
Author:   lordhoto
Date:     2010-03-18 21:45:27 +0000 (Thu, 18 Mar 2010)

Log Message:
-----------
Commit salty-horse's patch for VectorRendererSpec.cpp, which fixes the use of invalid C++.

Modified Paths:
--------------
    scummvm/trunk/graphics/VectorRendererSpec.cpp

Modified: scummvm/trunk/graphics/VectorRendererSpec.cpp
===================================================================
--- scummvm/trunk/graphics/VectorRendererSpec.cpp	2010-03-18 20:19:58 UTC (rev 48290)
+++ scummvm/trunk/graphics/VectorRendererSpec.cpp	2010-03-18 21:45:27 UTC (rev 48291)
@@ -145,14 +145,14 @@
 
 /** HELPER MACROS for WU's circle drawing algorithm **/
 #define __WU_DRAWCIRCLE(ptr1,ptr2,ptr3,ptr4,x,y,px,py,a) { \
-	blendPixelPtr(ptr1 + (y) - (px), color, a); \
-	blendPixelPtr(ptr1 + (x) - (py), color, a); \
-	blendPixelPtr(ptr2 - (x) - (py), color, a); \
-	blendPixelPtr(ptr2 - (y) - (px), color, a); \
-	blendPixelPtr(ptr3 - (y) + (px), color, a); \
-	blendPixelPtr(ptr3 - (x) + (py), color, a); \
-	blendPixelPtr(ptr4 + (x) + (py), color, a); \
-	blendPixelPtr(ptr4 + (y) + (px), color, a); \
+	this->blendPixelPtr(ptr1 + (y) - (px), color, a); \
+	this->blendPixelPtr(ptr1 + (x) - (py), color, a); \
+	this->blendPixelPtr(ptr2 - (x) - (py), color, a); \
+	this->blendPixelPtr(ptr2 - (y) - (px), color, a); \
+	this->blendPixelPtr(ptr3 - (y) + (px), color, a); \
+	this->blendPixelPtr(ptr3 - (x) + (py), color, a); \
+	this->blendPixelPtr(ptr4 + (x) + (py), color, a); \
+	this->blendPixelPtr(ptr4 + (y) + (px), color, a); \
 }
 
 // optimized Wu's algorithm
@@ -398,7 +398,7 @@
 
 template<typename PixelType>
 inline void VectorRendererSpec<PixelType>::
-blendPixelPtr(PixelType *ptr, PixelType color, uint8 alpha)	{
+blendPixelPtr(PixelType *ptr, PixelType color, uint8 alpha) {
 	register int idst = *ptr;
 	register int isrc = color;
 
@@ -1459,8 +1459,8 @@
 			ptr += xdir;
 			alpha = (error_acc >> 8);
 
-			blendPixelPtr(ptr, color, ~alpha);
-			blendPixelPtr(ptr + pitch, color, alpha);
+			this->blendPixelPtr(ptr, color, ~alpha);
+			this->blendPixelPtr(ptr + pitch, color, alpha);
 		}
 	} else {
 		gradient = (uint32)(dx << 16) / (uint32)dy;
@@ -1476,8 +1476,8 @@
 			ptr += pitch;
 			alpha = (error_acc >> 8);
 
-			blendPixelPtr(ptr, color, ~alpha);
-			blendPixelPtr(ptr + xdir, color, alpha);
+			this->blendPixelPtr(ptr, color, ~alpha);
+			this->blendPixelPtr(ptr + xdir, color, alpha);
 		}
 	}
 


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