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

indent

Browse source 
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%403382
This commit is contained in:
Sam Lantinga 2008-12-25 05:26:29 +00:00
parent c553683086
commit 08e0277512
4 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/video/SDL_bmp.c
View file

@ -218,7 +218,7 @@ SDL_LoadBMP_RW(SDL_RWops * src, int freesrc)
if (biClrUsed == 0) { if (biClrUsed == 0) {
biClrUsed = 1 << biBitCount; biClrUsed = 1 << biBitCount;
} }
if ((int)biClrUsed > palette->ncolors) { if ((int) biClrUsed > palette->ncolors) {
palette->ncolors = biClrUsed; palette->ncolors = biClrUsed;
palette->colors = palette->colors =
(SDL_Color *) SDL_realloc(palette->colors, (SDL_Color *) SDL_realloc(palette->colors,
@ -229,7 +229,7 @@ SDL_LoadBMP_RW(SDL_RWops * src, int freesrc)
was_error = 1; was_error = 1;
goto done; goto done;
} }
} else if ((int)biClrUsed < palette->ncolors) { } else if ((int) biClrUsed < palette->ncolors) {
palette->ncolors = biClrUsed; palette->ncolors = biClrUsed;
} }
if (biSize == 12) { if (biSize == 12) {

3
src/video/SDL_rect.c
View file

@ -119,7 +119,8 @@ SDL_UnionRect(const SDL_Rect * A, const SDL_Rect * B, SDL_Rect * result)
} }
SDL_bool SDL_bool
SDL_IntersectRectAndLine(const SDL_Rect *rect, int *X1, int *Y1, int *X2, int *Y2) SDL_IntersectRectAndLine(const SDL_Rect * rect, int *X1, int *Y1, int *X2,
int *Y2)
{ {
int x1, y1; int x1, y1;
int x2, y2; int x2, y2;

6
src/video/win32/SDL_d3drender.c
View file

@ -726,9 +726,9 @@ D3D_RenderFill(SDL_Renderer * renderer, const SDL_Rect * rect)
result = result =
IDirect3DDevice9_Clear(data->device, 1, &d3drect, D3DCLEAR_TARGET, IDirect3DDevice9_Clear(data->device, 1, &d3drect, D3DCLEAR_TARGET,
D3DCOLOR_ARGB(renderer->a, D3DCOLOR_ARGB(renderer->a,
renderer->r, renderer->r,
renderer->g, renderer->g,
renderer->b), 1.0f, 0); renderer->b), 1.0f, 0);
if (FAILED(result)) { if (FAILED(result)) {
D3D_SetError("Clear()", result); D3D_SetError("Clear()", result);
return -1; return -1;

2
src/video/x11/SDL_x11modes.c
View file

@ -157,7 +157,7 @@ X11_InitModes(_THIS)
displaydata->visual = vinfo.visual; displaydata->visual = vinfo.visual;
displaydata->depth = vinfo.depth; displaydata->depth = vinfo.depth;
displaydata->scanline_pad = SDL_BYTESPERPIXEL(mode.format)*8; displaydata->scanline_pad = SDL_BYTESPERPIXEL(mode.format) * 8;
pixmapFormats = XListPixmapFormats(data->display, &n); pixmapFormats = XListPixmapFormats(data->display, &n);
if (pixmapFormats) { if (pixmapFormats) {
for (i = 0; i < n; ++i) { for (i = 0; i < n; ++i) {