Author: cazfi
Date: Tue Nov 1 23:15:04 2016
New Revision: 34316
URL: http://svn.gna.org/viewcvs/freeciv?rev=34316&view=rev
Log:
Dropped unused load_surf_with_flags() from sdl2-client.
See patch #7898
Modified:
branches/S2_6/client/gui-sdl2/graphics.c
branches/S2_6/client/gui-sdl2/graphics.h
Modified: branches/S2_6/client/gui-sdl2/graphics.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl2/graphics.c?rev=34316&r1=34315&r2=34316&view=diff
==============================================================================
--- branches/S2_6/client/gui-sdl2/graphics.c (original)
+++ branches/S2_6/client/gui-sdl2/graphics.c Tue Nov 1 23:15:04 2016
@@ -320,37 +320,6 @@
#endif /* 0 */
return pBuf;
-}
-
-/**************************************************************************
- 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 */
}
/**************************************************************************
Modified: branches/S2_6/client/gui-sdl2/graphics.h
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl2/graphics.h?rev=34316&r1=34315&r2=34316&view=diff
==============================================================================
--- branches/S2_6/client/gui-sdl2/graphics.h (original)
+++ branches/S2_6/client/gui-sdl2/graphics.h Tue Nov 1 23:15:04 2016
@@ -230,7 +230,6 @@
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);
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
