[Gemrb-commits] gemrb: branch master updated. v0.7.0-439-g26b045d

[Tom <rtp...@us...>]

gemrb: Infinity Engine emulator

The branch master has been updated
       via  26b045d93c0d306695cd0ccab46b8de24fcab84d (commit)
       via  0d791ba9ecf18b0aeba3ea55158f097224d86a47 (commit)

Summary of changes:
 gemrb/includes/RGBAColor.h          |    2 +-
 gemrb/plugins/SDLVideo/SDLVideo.cpp |    6 +++---
 gemrb/plugins/SDLVideo/SDLVideo.h   |    4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)
      from  b445e390427c631d18b5851b9ff5a39988360a9b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=26b045d93c0d306695cd0ccab46b8de24fcab84d

commit 26b045d93c0d306695cd0ccab46b8de24fcab84d
Author: Tom Prince <tom...@ua...>
Date:   Tue Feb 28 00:26:02 2012 -0500

    Rename pixel to Pixel, to obey coding guidelines.

diff --git a/gemrb/plugins/SDLVideo/SDLVideo.cpp b/gemrb/plugins/SDLVideo/SDLVideo.cpp
index 6c2df4d..f1c8d69 100644
--- a/gemrb/plugins/SDLVideo/SDLVideo.cpp
+++ b/gemrb/plugins/SDLVideo/SDLVideo.cpp
@@ -1239,7 +1239,7 @@ void SDLVideoDriver::DrawRectSprite(const Region& rgn, const Color& color, const
 	}
 }
 
-inline void ReadPixel(long &val, pixel* pixels , int BytesPerPixel) {
+inline void ReadPixel(long &val, Pixel* pixels , int BytesPerPixel) {
 	if (BytesPerPixel == 1) {
 		val = *pixels;
 	} else if (BytesPerPixel == 2) {
@@ -1255,7 +1255,7 @@ inline void ReadPixel(long &val, pixel* pixels , int BytesPerPixel) {
 	}
 }
 
-inline void WritePixel(const long val, pixel* pixels, int BytesPerPixel) {
+inline void WritePixel(const long val, Pixel* pixels, int BytesPerPixel) {
 	if (BytesPerPixel == 1) {
 		*pixels = (unsigned char)val;
 	} else if (BytesPerPixel == 2) {
@@ -1704,7 +1704,7 @@ void SDLVideoDriver::DrawPolyline(Gem_Polygon* poly, const Color& color, bool fi
 			Point& c = poly->points[redge];
 			Point& d = poly->points[(redge+1)%(poly->count)];
 
-                       pixel* line = (pixel*)(backBuf->pixels) + (y_top+yCorr)*backBuf->pitch;
+                       Pixel* line = (Pixel*)(backBuf->pixels) + (y_top+yCorr)*backBuf->pitch;
 
 			for (int y = y_top; y < y_bot; ++y) {
 				int py = y + Viewport.y;
diff --git a/gemrb/plugins/SDLVideo/SDLVideo.h b/gemrb/plugins/SDLVideo/SDLVideo.h
index c5ee169..673a9fe 100644
--- a/gemrb/plugins/SDLVideo/SDLVideo.h
+++ b/gemrb/plugins/SDLVideo/SDLVideo.h
@@ -33,7 +33,7 @@ typedef unsigned char
 #ifdef __GNUC__
 	__attribute__((aligned(4)))
 #endif
-	pixel;
+	Pixel;
 
 inline int GetModState(int modstate)
 {

http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=0d791ba9ecf18b0aeba3ea55158f097224d86a47

commit 0d791ba9ecf18b0aeba3ea55158f097224d86a47
Author: Tom Prince <tom...@ua...>
Date:   Tue Feb 28 00:24:10 2012 -0500

    Fix stupid type from refactoring.

diff --git a/gemrb/includes/RGBAColor.h b/gemrb/includes/RGBAColor.h
index 9a9f67a..8b09ca0 100644
--- a/gemrb/includes/RGBAColor.h
+++ b/gemrb/includes/RGBAColor.h
@@ -29,7 +29,7 @@ struct Color {
 }
 #ifdef __GNUC__
 	__attribute__((aligned(4)))
-#else
+#endif
 	;
 
 #endif
diff --git a/gemrb/plugins/SDLVideo/SDLVideo.h b/gemrb/plugins/SDLVideo/SDLVideo.h
index 03539ce..c5ee169 100644
--- a/gemrb/plugins/SDLVideo/SDLVideo.h
+++ b/gemrb/plugins/SDLVideo/SDLVideo.h
@@ -32,7 +32,7 @@
 typedef unsigned char
 #ifdef __GNUC__
 	__attribute__((aligned(4)))
-#else
+#endif
 	pixel;
 
 inline int GetModState(int modstate)

-----------------------------------------------------------------------


This is an automated email from the git hooks/post-receive script.
-- 
gemrb: Infinity Engine emulator