From bff31e07eebfbd70af05cf7db54b262400be1ef6 Mon Sep 17 00:00:00 2001 From: cazfi Date: Tue, 1 Nov 2016 22:15:04 +0000 Subject: [PATCH] Dropped unused load_surf_with_flags() from sdl2-client. See patch #7898 git-svn-id: svn://svn.gna.org/svn/freeciv/branches/S2_6@34316 a0f10bec-cc02-0410-94fc-a9cfff90b4cd --- client/gui-sdl2/graphics.c | 31 ------------------------------- client/gui-sdl2/graphics.h | 1 - 2 files changed, 32 deletions(-) diff --git a/client/gui-sdl2/graphics.c b/client/gui-sdl2/graphics.c index 3899cb49c5..249a70156c 100644 --- a/client/gui-sdl2/graphics.c +++ b/client/gui-sdl2/graphics.c @@ -323,37 +323,6 @@ SDL_Surface *load_surf(const char *pFname) } /************************************************************************** - Load a surface from file putting it in soft or hardware mem - Warning: pFname must have full path to file -**************************************************************************/ -SDL_Surface *load_surf_with_flags(const char *pFname, int iFlags) -{ - SDL_Surface *pBuf = NULL; -#if 0 - SDL_Surface *pNew_sur = NULL; - SDL_PixelFormat *pSpf = SDL_GetVideoSurface()->format; -#endif - - if ((pBuf = IMG_Load(pFname)) == NULL) { - log_error(_("load_surf_with_flags: Unable to load file %s."), pFname); - return NULL; - } - - return pBuf; -#if 0 - if ((pNew_sur = SDL_ConvertSurface(pBuf, pSpf, iFlags)) == NULL) { - log_error(_("Unable to convert image from file %s into format %d."), - pFname, iFlags); - return pBuf; - } - - FREESURFACE(pBuf); - - return pNew_sur; -#endif /* 0 */ -} - -/************************************************************************** create an surface with format MUST NOT BE USED IF NO SDLSCREEN IS SET **************************************************************************/ diff --git a/client/gui-sdl2/graphics.h b/client/gui-sdl2/graphics.h index f3fedd1b38..5f464ce495 100644 --- a/client/gui-sdl2/graphics.h +++ b/client/gui-sdl2/graphics.h @@ -230,7 +230,6 @@ int screen_blit(SDL_Surface *src, SDL_Rect *srcrect, SDL_Rect *dstrect, unsigned char alpha_mod); SDL_Surface *load_surf(const char *pFname); -SDL_Surface *load_surf_with_flags(const char *pFname, int iFlags); SDL_Surface *create_surf_with_format(SDL_PixelFormat *pf, int width, int height, Uint32 flags); -- 2.11.4.GIT