0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix for bug 17573:

Browse source 
wesnoth unusable on certain comination of glibc and sdl du to changes
in memcopy
This commit is contained in:
Jérémy Rosen 2011-03-19 19:51:23 +00:00
parent 18bf79ef13
commit 15ef729b16
3 changed files with 43 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
data/core/about.cfg
View file

@ -1083,6 +1083,10 @@
[entry]
name = "Priit Laes (plaes)"
[/entry]
[entry]
name = "Richard Yao (srk9)"
comment = "Bug fixes"
[/entry]
[entry]
name = "Rocco J Carello (rogue)"
[/entry]

36
src/display.cpp
View file

@ -45,6 +45,12 @@
#endif
#include <cmath>
// Includes for bug #17573
#if defined(__GLIBC__)
#include <gnu/libc-version.h>
#include <cstdio>
#endif
static lg::log_domain log_display("display");
#define ERR_DP LOG_STREAM(err, log_display)
#define LOG_DP LOG_STREAM(info, log_display)
@ -130,6 +136,20 @@ display::display(CVideo& video, const gamemap* map, const config& theme_cfg, con
set_idle_anim_rate(preferences::idle_anim_rate());
image::set_zoom(zoom_);
#if defined(__GLIBC__)
// Runtime checks for bug #17573
// Get glibc runtime version information
int glibc, glibc_minor;
sscanf(gnu_get_libc_version(), "%d.%d", &glibc, &glibc_minor);
// Get SDL runtime version information
const SDL_version* v = SDL_Linked_Version();
do_reverse_memcpy_workaround_ = (glibc > 2 || (glibc == 2 && glibc_minor >= 13)) &&
(v->major < 1 || (v->major == 1 && v->minor < 2) ||
(v->major == 1 && v->minor == 2 && v->patch < 15) );
#endif
}
display::~display()
@ -1449,8 +1469,20 @@ bool display::scroll(int xmove, int ymove)
SDL_Rect srcrect = dstrect;
srcrect.x -= dx;
srcrect.y -= dy;
if (!screen_.update_locked())
sdl_blit(screen,&srcrect,screen,&dstrect);
if (!screen_.update_locked()) {
// Hack to workaround bug #17573
#if defined(__GLIBC__)
if (do_reverse_memcpy_workaround_) {
surface screen_copy = make_neutral_surface(screen);
SDL_BlitSurface(screen_copy,&srcrect,screen,&dstrect);
} else {
SDL_BlitSurface(screen,&srcrect,screen,&dstrect);
}
#else
SDL_BlitSurface(screen,&srcrect,screen,&dstrect);
#endif
}
//This is necessary to avoid a crash in some SDL versions on some systems
//see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=462794

5
src/display.hpp
View file

@ -834,6 +834,11 @@ private:
typedef std::map<map_location, arrows_list_t > arrows_map_t;
/** Maps the list of arrows for each location */
arrows_map_t arrows_map_;
#if defined(__GLIBC__)
/** Flag for bug #17573 - this is set in the constructor **/
bool do_reverse_memcpy_workaround_;
#endif
};
#endif