[Scummvm-cvs-logs] SF.net SVN: scummvm: [32154] scummvm/branches/gsoc2008-gui/graphics

drmccoy at users.sourceforge.net drmccoy at users.sourceforge.net
Sat May 17 18:45:28 CEST 2008


Revision: 32154
          http://scummvm.svn.sourceforge.net/scummvm/?rev=32154&view=rev
Author:   drmccoy
Date:     2008-05-17 09:45:28 -0700 (Sat, 17 May 2008)

Log Message:
-----------
Fixing compilation

Modified Paths:
--------------
    scummvm/branches/gsoc2008-gui/graphics/VectorRenderer.cpp
    scummvm/branches/gsoc2008-gui/graphics/VectorRenderer.h

Modified: scummvm/branches/gsoc2008-gui/graphics/VectorRenderer.cpp
===================================================================
--- scummvm/branches/gsoc2008-gui/graphics/VectorRenderer.cpp	2008-05-17 15:20:39 UTC (rev 32153)
+++ scummvm/branches/gsoc2008-gui/graphics/VectorRenderer.cpp	2008-05-17 16:45:28 UTC (rev 32154)
@@ -615,7 +615,7 @@
 
 template<typename PixelType, typename PixelFormat>
 void VectorRendererAA<PixelType, PixelFormat>::
-drawRoundedSquareAlg(int x1, int y1, int r, int w, int h, PixelType color, FillMode fill_m) {
+drawRoundedSquareAlg(int x1, int y1, int r, int w, int h, PixelType color, VectorRenderer::FillMode fill_m) {
 	int x, y;
 	int p = Base::surfacePitch(), px, py;
 	int sw = 0, sp = 0, hp = h * p;
@@ -632,7 +632,7 @@
 
 	int short_h = h - 2 * r;
 
-	if (fill_m == kNoFill) {
+	if (fill_m == VectorRenderer::kNoFill) {
 		while (sw++ < Base::_strokeWidth) {
 			Common::set_to(ptr_fill + sp + r, ptr_fill + w + 1 + sp - r, color);
 			Common::set_to(ptr_fill + hp - sp + r, ptr_fill + w + hp + 1 - sp - r, color);
@@ -684,7 +684,7 @@
 
 template<typename PixelType, typename PixelFormat>
 void VectorRendererAA<PixelType, PixelFormat>::
-drawCircleAlg(int x1, int y1, int r, PixelType color, FillMode fill_m) {
+drawCircleAlg(int x1, int y1, int r, PixelType color, VectorRenderer::FillMode fill_m) {
 	int x, y, sw = 0;
 	int p = Base::surfacePitch(), px, py;
 
@@ -694,7 +694,7 @@
 
 	PixelType *ptr = (PixelType *)Base::_activeSurface->getBasePtr(x1, y1);
 
-	if (fill_m == kNoFill) {
+	if (fill_m == VectorRenderer::kNoFill) {
 		while (sw++ < Base::_strokeWidth) {
 			x = r - (sw - 1); y = 0; T = 0;
 			px = p * x; py = 0;
@@ -732,4 +732,4 @@
 	}
 }
 
-} // end of namespace Graphics
\ No newline at end of file
+} // end of namespace Graphics

Modified: scummvm/branches/gsoc2008-gui/graphics/VectorRenderer.h
===================================================================
--- scummvm/branches/gsoc2008-gui/graphics/VectorRenderer.h	2008-05-17 15:20:39 UTC (rev 32153)
+++ scummvm/branches/gsoc2008-gui/graphics/VectorRenderer.h	2008-05-17 16:45:28 UTC (rev 32154)
@@ -453,9 +453,9 @@
 	 *
 	 * @see VectorRenderer::drawCircleAlg()
 	 */
-	virtual void drawCircleAlg(int x, int y, int r, PixelType color, FillMode fill_m);
+	virtual void drawCircleAlg(int x, int y, int r, PixelType color, VectorRenderer::FillMode fill_m);
 
-	virtual void drawRoundedSquareAlg(int x1, int y1, int r, int w, int h, PixelType color, FillMode fill_m);
+	virtual void drawRoundedSquareAlg(int x1, int y1, int r, int w, int h, PixelType color, VectorRenderer::FillMode fill_m);
 };
 
 } // end of namespace Graphics


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




More information about the Scummvm-git-logs mailing list