widelands-dev team mailing list archive

[SirVer <SirVer@xxxxxx>]

Review: Needs Fixing



Diff comments:

> === modified file 'src/base/i18n.cc'
> --- src/base/i18n.cc	2014-06-21 15:17:04 +0000
> +++ src/base/i18n.cc	2014-07-14 12:52:01 +0000
> @@ -19,6 +19,10 @@
>  
>  #include "base/i18n.h"
>  
> +#ifdef __FreeBSD__
> +#  include <clocale>
> +#endif
> +
>  #include <cstdlib>
>  #include <map>
>  #include <utility>
> 
> === modified file 'src/wui/mapviewpixelfunctions.cc'
> --- src/wui/mapviewpixelfunctions.cc	2014-06-19 13:05:48 +0000
> +++ src/wui/mapviewpixelfunctions.cc	2014-07-14 12:52:01 +0000
> @@ -111,7 +111,8 @@
>  {
>  	normalize_pix(map, a);
>  	normalize_pix(map, b);
> -	uint32_t dx = abs(a.x - b.x), dy = abs(a.y - b.y);
> +	uint32_t dx = std::abs(static_cast<double>(a.x - b.x));

why do you cast to double? .x,.y are integers... I am really confused about the problem the compiler has here. If you need to cast to something I suggest casting to <int> which should be save here.

> +	uint32_t dy = std::abs(static_cast<double>(a.y - b.y));
>  	{
>  		const uint32_t map_end_screen_x = get_map_end_screen_x(map);
>  		if (dx > map_end_screen_x / 2)
> 


-- 
https://code.launchpad.net/~widelands-dev/widelands/freebsd/+merge/225867
Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/freebsd.