Author: mordante
Date: Tue May 12 23:06:06 2009
New Revision: 35614
URL: http://svn.gna.org/viewcvs/wesnoth?rev=35614&view=rev
Log:
Remove an unused function.
Modified:
trunk/src/sdl_utils.cpp
trunk/src/sdl_utils.hpp
Modified: trunk/src/sdl_utils.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/sdl_utils.cpp?rev=35614&r1=35613&r2=35614&view=diff
==============================================================================
--- trunk/src/sdl_utils.cpp (original)
+++ trunk/src/sdl_utils.cpp Tue May 12 23:06:06 2009
@@ -84,18 +84,6 @@
return res;
}
-SDL_Rect union_rects(const SDL_Rect& rect1, const SDL_Rect& rect2)
-{
- SDL_Rect result;
-
- result.x = std::min(rect1.x, rect2.x);
- result.w = std::max(rect1.x + rect1.w, rect2.x + rect2.w) - result.x;
-
- result.y = std::min(rect1.y, rect2.y);
- result.h = std::max(rect1.y + rect1.h, rect2.y + rect2.h) - result.y;
-
- return result;
-}
SDL_Rect get_rect_union(SDL_Rect const &rect1, SDL_Rect const& rect2) {
const int left_side = std::max(rect1.x, rect2.x);
const int right_side = std::min(rect1.x + rect1.w, rect2.x + rect2.w);
Modified: trunk/src/sdl_utils.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/sdl_utils.hpp?rev=35614&r1=35613&r2=35614&view=diff
==============================================================================
--- trunk/src/sdl_utils.hpp (original)
+++ trunk/src/sdl_utils.hpp Tue May 12 23:06:06 2009
@@ -56,16 +56,6 @@
bool point_in_rect(int x, int y, const SDL_Rect& rect);
bool rects_overlap(const SDL_Rect& rect1, const SDL_Rect& rect2);
SDL_Rect intersect_rects(SDL_Rect const &rect1, SDL_Rect const &rect2);
-
-/**
- * Returns the smallest rectangle containing the union of two rectangles.
- *
- * @param rect1 The first rectangle.
- * @param rect2 The second rectangle.
- *
- * @returns The smallest rectangle that contains both
rect1 and rect2.
- */
-SDL_Rect union_rects(const SDL_Rect& rect1, const SDL_Rect& rect2);
/**
* Returns the union of two rectangles.
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
