aboutsummaryrefslogtreecommitdiff
path: root/graphics/VectorRenderer.cpp
diff options
context:
space:
mode:
authorJohannes Schickel2008-05-03 21:09:08 +0000
committerJohannes Schickel2008-05-03 21:09:08 +0000
commit8004a64c2f8e80bf2998970bcf352bb9c20f8805 (patch)
tree6bd38fe4d11ef7120e8701b14e18d61034c16095 /graphics/VectorRenderer.cpp
parent8c043f53edd164644048836202d96ee9ab996c5c (diff)
downloadscummvm-rg350-8004a64c2f8e80bf2998970bcf352bb9c20f8805.tar.gz
scummvm-rg350-8004a64c2f8e80bf2998970bcf352bb9c20f8805.tar.bz2
scummvm-rg350-8004a64c2f8e80bf2998970bcf352bb9c20f8805.zip
- Added missing virtual destructor in VectorRenderer
- Added graphics/VectorRenderer.cpp to the build system - Fixed compiling with g++ 4.2 svn-id: r31847
Diffstat (limited to 'graphics/VectorRenderer.cpp')
-rw-r--r--graphics/VectorRenderer.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/graphics/VectorRenderer.cpp b/graphics/VectorRenderer.cpp
index 0ffaf9811d..4a462cf5fa 100644
--- a/graphics/VectorRenderer.cpp
+++ b/graphics/VectorRenderer.cpp
@@ -34,7 +34,7 @@ namespace Graphics {
inline uint32 fp_sqroot( uint32 x );
VectorRenderer *createRenderer() {
- return new VectorRendererAA<uint16,ColorMasks<565>>;
+ return new VectorRendererAA<uint16,ColorMasks<565> >;
}
@@ -125,7 +125,7 @@ template<typename PixelType, typename PixelFormat>
void VectorRendererAA<PixelType,PixelFormat>::
blendPixelPtr( PixelType *ptr, uint8 alpha ) {
register int idst = *ptr;
- register int isrc = _color;
+ register int isrc = Base::_color;
*ptr = (PixelType)(
(PixelFormat::kRedMask & ((idst & PixelFormat::kRedMask) +
@@ -144,12 +144,12 @@ template<typename PixelType, typename PixelFormat>
void VectorRendererAA<PixelType,PixelFormat>::
drawLineAlg(int x1, int y1, int x2, int y2, int dx, int dy) {
- PixelType *ptr = (PixelType *)_activeSurface->getBasePtr(x1, y1);
- int pitch = surfacePitch();
+ PixelType *ptr = (PixelType *)Base::_activeSurface->getBasePtr(x1, y1);
+ int pitch = Base::surfacePitch();
int xdir = (x2 > x1) ? 1 : -1;
uint16 error_tmp, error_acc, gradient;
- *ptr = (PixelType)_color;
+ *ptr = (PixelType)Base::_color;
if ( dx > dy ) {
gradient = (uint32)(dy<<16)/(uint32)dx;
@@ -185,7 +185,7 @@ drawLineAlg(int x1, int y1, int x2, int y2, int dx, int dy) {
}
}
- putPixel( x2, y2 );
+ Base::putPixel( x2, y2 );
}
template<typename PixelType, typename PixelFormat>