ran make indent
authorBob Pendleton <bob@pendleton.com>
Fri, 14 Mar 2008 20:43:44 +0000
changeset 2329c1a390f6a819
parent 2328 91e601d9df8b
child 2330 3458c74b5fab
ran make indent
include/SDL_compat.h
src/video/SDL_blit.c
src/video/SDL_surface.c
     1.1 --- a/include/SDL_compat.h	Fri Mar 14 18:17:49 2008 +0000
     1.2 +++ b/include/SDL_compat.h	Fri Mar 14 20:43:44 2008 +0000
     1.3 @@ -209,58 +209,47 @@
     1.4  #define SDL_AllocSurface    SDL_CreateRGBSurface
     1.5  
     1.6  extern DECLSPEC const SDL_version *SDLCALL SDL_Linked_Version(void);
     1.7 -extern DECLSPEC char *SDLCALL SDL_AudioDriverName(char *namebuf,
     1.8 -                                                  int maxlen);
     1.9 -extern DECLSPEC char *SDLCALL SDL_VideoDriverName(char *namebuf,
    1.10 -                                                  int maxlen);
    1.11 +extern DECLSPEC char *SDLCALL SDL_AudioDriverName(char *namebuf, int maxlen);
    1.12 +extern DECLSPEC char *SDLCALL SDL_VideoDriverName(char *namebuf, int maxlen);
    1.13  extern DECLSPEC const SDL_VideoInfo *SDLCALL SDL_GetVideoInfo(void);
    1.14  extern DECLSPEC int SDLCALL SDL_VideoModeOK(int width,
    1.15                                              int height,
    1.16 -                                            int bpp,
    1.17 -                                            Uint32 flags);
    1.18 +                                            int bpp, Uint32 flags);
    1.19  extern DECLSPEC SDL_Rect **SDLCALL SDL_ListModes(SDL_PixelFormat * format,
    1.20                                                   Uint32 flags);
    1.21  extern DECLSPEC SDL_Surface *SDLCALL SDL_SetVideoMode(int width,
    1.22                                                        int height,
    1.23 -                                                      int bpp,
    1.24 -                                                      Uint32 flags);
    1.25 +                                                      int bpp, Uint32 flags);
    1.26  extern DECLSPEC SDL_Surface *SDLCALL SDL_GetVideoSurface(void);
    1.27  extern DECLSPEC void SDLCALL SDL_UpdateRects(SDL_Surface * screen,
    1.28 -                                             int numrects,
    1.29 -                                             SDL_Rect * rects);
    1.30 +                                             int numrects, SDL_Rect * rects);
    1.31  extern DECLSPEC void SDLCALL SDL_UpdateRect(SDL_Surface * screen,
    1.32                                              Sint32 x,
    1.33 -                                            Sint32 y,
    1.34 -                                            Uint32 w,
    1.35 -                                            Uint32 h);
    1.36 +                                            Sint32 y, Uint32 w, Uint32 h);
    1.37  extern DECLSPEC int SDLCALL SDL_Flip(SDL_Surface * screen);
    1.38  extern DECLSPEC int SDLCALL SDL_SetAlpha(SDL_Surface * surface,
    1.39 -                                         Uint32 flag,
    1.40 -                                         Uint8 alpha);
    1.41 +                                         Uint32 flag, Uint8 alpha);
    1.42  extern DECLSPEC SDL_Surface *SDLCALL SDL_DisplayFormat(SDL_Surface * surface);
    1.43 -extern DECLSPEC SDL_Surface *SDLCALL SDL_DisplayFormatAlpha(SDL_Surface * surface);
    1.44 +extern DECLSPEC SDL_Surface *SDLCALL SDL_DisplayFormatAlpha(SDL_Surface *
    1.45 +                                                            surface);
    1.46  extern DECLSPEC void SDLCALL SDL_WM_SetCaption(const char *title,
    1.47                                                 const char *icon);
    1.48  extern DECLSPEC void SDLCALL SDL_WM_GetCaption(const char **title,
    1.49                                                 const char **icon);
    1.50 -extern DECLSPEC void SDLCALL SDL_WM_SetIcon(SDL_Surface * icon,
    1.51 -                                            Uint8 * mask);
    1.52 +extern DECLSPEC void SDLCALL SDL_WM_SetIcon(SDL_Surface * icon, Uint8 * mask);
    1.53  extern DECLSPEC int SDLCALL SDL_WM_IconifyWindow(void);
    1.54  extern DECLSPEC int SDLCALL SDL_WM_ToggleFullScreen(SDL_Surface * surface);
    1.55  extern DECLSPEC SDL_GrabMode SDLCALL SDL_WM_GrabInput(SDL_GrabMode mode);
    1.56  extern DECLSPEC int SDLCALL SDL_SetPalette(SDL_Surface * surface,
    1.57                                             int flags,
    1.58                                             const SDL_Color * colors,
    1.59 -                                           int firstcolor,
    1.60 -                                           int ncolors);
    1.61 +                                           int firstcolor, int ncolors);
    1.62  extern DECLSPEC int SDLCALL SDL_SetColors(SDL_Surface * surface,
    1.63                                            const SDL_Color * colors,
    1.64 -                                          int firstcolor,
    1.65 -                                          int ncolors);
    1.66 +                                          int firstcolor, int ncolors);
    1.67  extern DECLSPEC int SDLCALL SDL_GetWMInfo(struct SDL_SysWMinfo *info);
    1.68  extern DECLSPEC Uint8 SDLCALL SDL_GetAppState(void);
    1.69 -extern DECLSPEC void SDLCALL SDL_WarpMouse(Uint16 x,
    1.70 -                                           Uint16 y);
    1.71 +extern DECLSPEC void SDLCALL SDL_WarpMouse(Uint16 x, Uint16 y);
    1.72  extern DECLSPEC SDL_Overlay *SDLCALL SDL_CreateYUVOverlay(int width,
    1.73                                                            int height,
    1.74                                                            Uint32 format,
    1.75 @@ -272,10 +261,8 @@
    1.76                                                    SDL_Rect * dstrect);
    1.77  extern DECLSPEC void SDLCALL SDL_FreeYUVOverlay(SDL_Overlay * overlay);
    1.78  extern DECLSPEC void SDLCALL SDL_GL_SwapBuffers(void);
    1.79 -extern DECLSPEC int SDLCALL SDL_EnableKeyRepeat(int delay,
    1.80 -int interval);
    1.81 -extern DECLSPEC void SDLCALL SDL_GetKeyRepeat(int *delay,
    1.82 -                                              int *interval);
    1.83 +extern DECLSPEC int SDLCALL SDL_EnableKeyRepeat(int delay, int interval);
    1.84 +extern DECLSPEC void SDLCALL SDL_GetKeyRepeat(int *delay, int *interval);
    1.85  extern DECLSPEC int SDLCALL SDL_EnableUNICODE(int enable);
    1.86  
    1.87  /* Ends C function definitions when using C++ */
     2.1 --- a/src/video/SDL_blit.c	Fri Mar 14 18:17:49 2008 +0000
     2.2 +++ b/src/video/SDL_blit.c	Fri Mar 14 20:43:44 2008 +0000
     2.3 @@ -230,6 +230,7 @@
     2.4      /* See if we can do RLE acceleration */
     2.5      if (surface->map->info.flags & SDL_COPY_RLE_DESIRED) {
     2.6          if (SDL_RLESurface(surface) == 0) {
     2.7 +            surface->map->info.flags &= ~SDL_COPY_RLE_DESIRED;
     2.8              return 0;
     2.9          }
    2.10      }
    2.11 @@ -260,7 +261,7 @@
    2.12                                         surface->format->Amask);
    2.13          Uint32 dst_format =
    2.14              SDL_MasksToPixelFormatEnum(dst->format->BitsPerPixel,
    2.15 -                                       dst->format->Rmask, 
    2.16 +                                       dst->format->Rmask,
    2.17                                         dst->format->Gmask,
    2.18                                         dst->format->Bmask,
    2.19                                         dst->format->Amask);
     3.1 --- a/src/video/SDL_surface.c	Fri Mar 14 18:17:49 2008 +0000
     3.2 +++ b/src/video/SDL_surface.c	Fri Mar 14 20:43:44 2008 +0000
     3.3 @@ -543,10 +543,10 @@
     3.4              return (-1);
     3.5          }
     3.6          /* just here for debugging */
     3.7 -/*         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",  */
     3.8 -/*                src, dst->flags, src->map->info.flags, */
     3.9 -/*                dst, dst->flags, dst->map->info.flags, */
    3.10 -/*                src->map->blit); */
    3.11 +/*         printf */
    3.12 +/*             ("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", */
    3.13 +/*              src, dst->flags, src->map->info.flags, dst, dst->flags, */
    3.14 +/*              dst->map->info.flags, src->map->blit); */
    3.15      }
    3.16      return (src->map->blit(src, srcrect, dst, dstrect));
    3.17  }