summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Pendleton <bob@pendleton.com>2008-03-14 20:43:44 +0000
committerBob Pendleton <bob@pendleton.com>2008-03-14 20:43:44 +0000
commitcaf2f69b88704f8b71ae8c6209ea943da0b8f533 (patch)
tree9fd403313ac6349bad8c6b10b6a3171cb4cc969b
parentdf7f46c7f54bc8b9a5806a9ea536cfb440201c6b (diff)
downloadsdl-caf2f69b88704f8b71ae8c6209ea943da0b8f533.tar.gz
ran make indent
-rw-r--r--include/SDL_compat.h43
-rw-r--r--src/video/SDL_blit.c3
-rw-r--r--src/video/SDL_surface.c8
3 files changed, 21 insertions, 33 deletions
diff --git a/include/SDL_compat.h b/include/SDL_compat.h
index e7da5a159..0d47420a2 100644
--- a/include/SDL_compat.h
+++ b/include/SDL_compat.h
@@ -209,58 +209,47 @@ struct SDL_SysWMinfo;
#define SDL_AllocSurface SDL_CreateRGBSurface
extern DECLSPEC const SDL_version *SDLCALL SDL_Linked_Version(void);
-extern DECLSPEC char *SDLCALL SDL_AudioDriverName(char *namebuf,
- int maxlen);
-extern DECLSPEC char *SDLCALL SDL_VideoDriverName(char *namebuf,
- int maxlen);
+extern DECLSPEC char *SDLCALL SDL_AudioDriverName(char *namebuf, int maxlen);
+extern DECLSPEC char *SDLCALL SDL_VideoDriverName(char *namebuf, int maxlen);
extern DECLSPEC const SDL_VideoInfo *SDLCALL SDL_GetVideoInfo(void);
extern DECLSPEC int SDLCALL SDL_VideoModeOK(int width,
int height,
- int bpp,
- Uint32 flags);
+ int bpp, Uint32 flags);
extern DECLSPEC SDL_Rect **SDLCALL SDL_ListModes(SDL_PixelFormat * format,
Uint32 flags);
extern DECLSPEC SDL_Surface *SDLCALL SDL_SetVideoMode(int width,
int height,
- int bpp,
- Uint32 flags);
+ int bpp, Uint32 flags);
extern DECLSPEC SDL_Surface *SDLCALL SDL_GetVideoSurface(void);
extern DECLSPEC void SDLCALL SDL_UpdateRects(SDL_Surface * screen,
- int numrects,
- SDL_Rect * rects);
+ int numrects, SDL_Rect * rects);
extern DECLSPEC void SDLCALL SDL_UpdateRect(SDL_Surface * screen,
Sint32 x,
- Sint32 y,
- Uint32 w,
- Uint32 h);
+ Sint32 y, Uint32 w, Uint32 h);
extern DECLSPEC int SDLCALL SDL_Flip(SDL_Surface * screen);
extern DECLSPEC int SDLCALL SDL_SetAlpha(SDL_Surface * surface,
- Uint32 flag,
- Uint8 alpha);
+ Uint32 flag, Uint8 alpha);
extern DECLSPEC SDL_Surface *SDLCALL SDL_DisplayFormat(SDL_Surface * surface);
-extern DECLSPEC SDL_Surface *SDLCALL SDL_DisplayFormatAlpha(SDL_Surface * surface);
+extern DECLSPEC SDL_Surface *SDLCALL SDL_DisplayFormatAlpha(SDL_Surface *
+ surface);
extern DECLSPEC void SDLCALL SDL_WM_SetCaption(const char *title,
const char *icon);
extern DECLSPEC void SDLCALL SDL_WM_GetCaption(const char **title,
const char **icon);
-extern DECLSPEC void SDLCALL SDL_WM_SetIcon(SDL_Surface * icon,
- Uint8 * mask);
+extern DECLSPEC void SDLCALL SDL_WM_SetIcon(SDL_Surface * icon, Uint8 * mask);
extern DECLSPEC int SDLCALL SDL_WM_IconifyWindow(void);
extern DECLSPEC int SDLCALL SDL_WM_ToggleFullScreen(SDL_Surface * surface);
extern DECLSPEC SDL_GrabMode SDLCALL SDL_WM_GrabInput(SDL_GrabMode mode);
extern DECLSPEC int SDLCALL SDL_SetPalette(SDL_Surface * surface,
int flags,
const SDL_Color * colors,
- int firstcolor,
- int ncolors);
+ int firstcolor, int ncolors);
extern DECLSPEC int SDLCALL SDL_SetColors(SDL_Surface * surface,
const SDL_Color * colors,
- int firstcolor,
- int ncolors);
+ int firstcolor, int ncolors);
extern DECLSPEC int SDLCALL SDL_GetWMInfo(struct SDL_SysWMinfo *info);
extern DECLSPEC Uint8 SDLCALL SDL_GetAppState(void);
-extern DECLSPEC void SDLCALL SDL_WarpMouse(Uint16 x,
- Uint16 y);
+extern DECLSPEC void SDLCALL SDL_WarpMouse(Uint16 x, Uint16 y);
extern DECLSPEC SDL_Overlay *SDLCALL SDL_CreateYUVOverlay(int width,
int height,
Uint32 format,
@@ -272,10 +261,8 @@ extern DECLSPEC int SDLCALL SDL_DisplayYUVOverlay(SDL_Overlay * overlay,
SDL_Rect * dstrect);
extern DECLSPEC void SDLCALL SDL_FreeYUVOverlay(SDL_Overlay * overlay);
extern DECLSPEC void SDLCALL SDL_GL_SwapBuffers(void);
-extern DECLSPEC int SDLCALL SDL_EnableKeyRepeat(int delay,
-int interval);
-extern DECLSPEC void SDLCALL SDL_GetKeyRepeat(int *delay,
- int *interval);
+extern DECLSPEC int SDLCALL SDL_EnableKeyRepeat(int delay, int interval);
+extern DECLSPEC void SDLCALL SDL_GetKeyRepeat(int *delay, int *interval);
extern DECLSPEC int SDLCALL SDL_EnableUNICODE(int enable);
/* Ends C function definitions when using C++ */
diff --git a/src/video/SDL_blit.c b/src/video/SDL_blit.c
index 5caaeb6f8..2d9c13bca 100644
--- a/src/video/SDL_blit.c
+++ b/src/video/SDL_blit.c
@@ -230,6 +230,7 @@ SDL_CalculateBlit(SDL_Surface * surface)
/* See if we can do RLE acceleration */
if (surface->map->info.flags & SDL_COPY_RLE_DESIRED) {
if (SDL_RLESurface(surface) == 0) {
+ surface->map->info.flags &= ~SDL_COPY_RLE_DESIRED;
return 0;
}
}
@@ -260,7 +261,7 @@ SDL_CalculateBlit(SDL_Surface * surface)
surface->format->Amask);
Uint32 dst_format =
SDL_MasksToPixelFormatEnum(dst->format->BitsPerPixel,
- dst->format->Rmask,
+ dst->format->Rmask,
dst->format->Gmask,
dst->format->Bmask,
dst->format->Amask);
diff --git a/src/video/SDL_surface.c b/src/video/SDL_surface.c
index bcb41d8b7..3d7a68c70 100644
--- a/src/video/SDL_surface.c
+++ b/src/video/SDL_surface.c
@@ -543,10 +543,10 @@ SDL_LowerBlit(SDL_Surface * src, SDL_Rect * srcrect,
return (-1);
}
/* just here for debugging */
-/* printf("src = 0x%08X src->flags = %08X src->map->info.flags = %08x\ndst = 0x%08X dst->flags = %08X dst->map->info.flags = %08X\nsrc->map->blit = 0x%08x\n", */
-/* src, dst->flags, src->map->info.flags, */
-/* dst, dst->flags, dst->map->info.flags, */
-/* src->map->blit); */
+/* printf */
+/* ("src = 0x%08X src->flags = %08X src->map->info.flags = %08x\ndst = 0x%08X dst->flags = %08X dst->map->info.flags = %08X\nsrc->map->blit = 0x%08x\n", */
+/* src, dst->flags, src->map->info.flags, dst, dst->flags, */
+/* dst->map->info.flags, src->map->blit); */
}
return (src->map->blit(src, srcrect, dst, dstrect));
}