Mercurial > sdl-ios-xcode

changeset 3932:cd5b5c52a37e SDL-1.2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Const correctness patch for SDL_MapRGB and SDL_MapRGBA. Fixes Bugzilla #421.
author Ryan C. Gordon <icculus@icculus.org>
date Wed, 04 Apr 2007 09:40:40 +0000
parents d65b4a73c991
children 3b5c90889156
files include/SDL_video.h src/video/SDL_pixels.c
diffstat 2 files changed, 11 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/include/SDL_video.h	Wed Apr 04 09:32:29 2007 +0000
+++ b/include/SDL_video.h	Wed Apr 04 09:40:40 2007 +0000
@@ -447,13 +447,15 @@
  * Maps an RGB triple to an opaque pixel value for a given pixel format
  */
 extern DECLSPEC Uint32 SDLCALL SDL_MapRGB
-			(SDL_PixelFormat *format, Uint8 r, Uint8 g, Uint8 b);
+(const SDL_PixelFormat * const format,
+ const Uint8 r, const Uint8 g, const Uint8 b);
 
 /*
  * Maps an RGBA quadruple to a pixel value for a given pixel format
  */
-extern DECLSPEC Uint32 SDLCALL SDL_MapRGBA(SDL_PixelFormat *format,
-				   Uint8 r, Uint8 g, Uint8 b, Uint8 a);
+extern DECLSPEC Uint32 SDLCALL SDL_MapRGBA
+(const SDL_PixelFormat * const format,
+ const Uint8 r, const Uint8 g, const Uint8 b, const Uint8 a);
 
 /*
  * Maps a pixel value into the RGB components for a given pixel format
--- a/src/video/SDL_pixels.c	Wed Apr 04 09:32:29 2007 +0000
+++ b/src/video/SDL_pixels.c	Wed Apr 04 09:40:40 2007 +0000
@@ -337,7 +337,9 @@
 }
 
 /* Find the opaque pixel value corresponding to an RGB triple */
-Uint32 SDL_MapRGB(SDL_PixelFormat *format, Uint8 r, Uint8 g, Uint8 b)
+Uint32 SDL_MapRGB
+(const SDL_PixelFormat * const format,
+ const Uint8 r, const Uint8 g, const Uint8 b)
 {
 	if ( format->palette == NULL ) {
 		return (r >> format->Rloss) << format->Rshift
@@ -350,7 +352,9 @@
 }
 
 /* Find the pixel value corresponding to an RGBA quadruple */
-Uint32 SDL_MapRGBA(SDL_PixelFormat *format, Uint8 r, Uint8 g, Uint8 b, Uint8 a)
+Uint32 SDL_MapRGBA
+(const SDL_PixelFormat * const format,
+ const Uint8 r, const Uint8 g, const Uint8 b, const Uint8 a)
 {
 	if ( format->palette == NULL ) {
 	        return (r >> format->Rloss) << format->Rshift