pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merged r3007:3008 from branches/SDL-1.2: MapRGB/MapRGBA const correctness.

Browse source 
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%402299
This commit is contained in:
Ryan C. Gordon 2007-04-04 09:43:53 +00:00
parent 1ee63d6997
commit dfd9387039
2 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
include/SDL_video.h
View file

@ -1300,15 +1300,16 @@ extern DECLSPEC void SDLCALL SDL_DestroyRenderer(SDL_WindowID windowID);
/* /*
* Maps an RGB triple to an opaque pixel value for a given pixel format * Maps an RGB triple to an opaque pixel value for a given pixel format
*/ */
extern DECLSPEC Uint32 SDLCALL SDL_MapRGB extern DECLSPEC Uint32 SDLCALL SDL_MapRGB(const SDL_PixelFormat * const format,
(SDL_PixelFormat * format, Uint8 r, Uint8 g, Uint8 b); const Uint8 r, const Uint8 g,
const Uint8 b);
/* /*
* Maps an RGBA quadruple to a pixel value for a given pixel format * Maps an RGBA quadruple to a pixel value for a given pixel format
*/ */
extern DECLSPEC Uint32 SDLCALL SDL_MapRGBA(SDL_PixelFormat * format, extern DECLSPEC Uint32 SDLCALL SDL_MapRGBA(const SDL_PixelFormat * const fmt,
Uint8 r, Uint8 g, Uint8 b, const Uint8 r, const Uint8 g,
Uint8 a); const Uint8 b, const Uint8 a);
/* /*
* Maps a pixel value into the RGB components for a given pixel format * Maps a pixel value into the RGB components for a given pixel format

6
src/video/SDL_pixels.c
View file

@ -537,7 +537,8 @@ SDL_FindColor(SDL_Palette * pal, Uint8 r, Uint8 g, Uint8 b)
/* Find the opaque pixel value corresponding to an RGB triple */ /* Find the opaque pixel value corresponding to an RGB triple */
Uint32 Uint32
SDL_MapRGB(SDL_PixelFormat * format, Uint8 r, Uint8 g, Uint8 b) SDL_MapRGB(const SDL_PixelFormat * const format, const Uint8 r, const Uint8 g,
const Uint8 b)
{ {
if (format->palette == NULL) { if (format->palette == NULL) {
return (r >> format->Rloss) << format->Rshift return (r >> format->Rloss) << format->Rshift
@ -550,7 +551,8 @@ SDL_MapRGB(SDL_PixelFormat * format, Uint8 r, Uint8 g, Uint8 b)
/* Find the pixel value corresponding to an RGBA quadruple */ /* Find the pixel value corresponding to an RGBA quadruple */
Uint32 Uint32
SDL_MapRGBA(SDL_PixelFormat * format, Uint8 r, Uint8 g, Uint8 b, Uint8 a) SDL_MapRGBA(const SDL_PixelFormat * const format, const Uint8 r, const Uint8 g,
const Uint8 b, const Uint8 a)
{ {
if (format->palette == NULL) { if (format->palette == NULL) {
return (r >> format->Rloss) << format->Rshift return (r >> format->Rloss) << format->Rshift