Mercurial > sdl-ios-xcode

changeset 2329:c1a390f6a819

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ran make indent
author Bob Pendleton <bob@pendleton.com>
date Fri, 14 Mar 2008 20:43:44 +0000
parents 91e601d9df8b
children 3458c74b5fab
files include/SDL_compat.h src/video/SDL_blit.c src/video/SDL_surface.c
diffstat 3 files changed, 21 insertions(+), 33 deletions(-) [+]
line wrap: on
line diff
--- a/include/SDL_compat.h	Fri Mar 14 18:17:49 2008 +0000
+++ b/include/SDL_compat.h	Fri Mar 14 20:43:44 2008 +0000
@@ -209,58 +209,47 @@
 #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 @@
                                                   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++ */
--- a/src/video/SDL_blit.c	Fri Mar 14 18:17:49 2008 +0000
+++ b/src/video/SDL_blit.c	Fri Mar 14 20:43:44 2008 +0000
@@ -230,6 +230,7 @@
     /* 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 @@
                                        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);
--- a/src/video/SDL_surface.c	Fri Mar 14 18:17:49 2008 +0000
+++ b/src/video/SDL_surface.c	Fri Mar 14 20:43:44 2008 +0000
@@ -543,10 +543,10 @@
             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));
 }