Fix for coverity #29394

[supertux.git] / src / object / anchor_point.cpp

diff --git a/src/object/anchor_point.cpp b/src/object/anchor_point.cpp
index 0173d61..2499c9e 100644 (file)
--- a/src/object/anchor_point.cpp
+++ b/src/object/anchor_point.cpp
@@ -1,10 +1,28 @@
+//  SuperTux
+//  Copyright (C) 2006 Matthias Braun <matze@braunis.de>
+//
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#include "object/anchor_point.hpp"
+
 #include <config.h>
 
 #include <stdexcept>
 #include <sstream>
-#include "anchor_point.hpp"
-#include "math/rect.hpp"
-#include "msg.hpp"
+
+#include "math/rectf.hpp"
+#include "util/log.hpp"
 
 std::string anchor_point_to_string(AnchorPoint point)
 {
@@ -52,16 +70,16 @@ AnchorPoint string_to_anchor_point(const std::string& str)
     return ANCHOR_BOTTOM;
   else if(str == "bottomright")
     return ANCHOR_BOTTOM_RIGHT;
-    
+
   std::ostringstream msg;
   msg << "Unknown anchor '" << str << "'";
   throw std::runtime_error(msg.str());
 }
 
-Vector get_anchor_pos(const Rect& rect, AnchorPoint point)
+Vector get_anchor_pos(const Rectf& rect, AnchorPoint point)
 {
   Vector result;
-  
+
   switch(point & ANCHOR_V_MASK) {
     case ANCHOR_LEFT:
       result.x = rect.get_left();
@@ -73,10 +91,7 @@ Vector get_anchor_pos(const Rect& rect, AnchorPoint point)
       result.x = rect.get_right();
       break;
     default:
-#ifdef DEBUG
-      throw std::runtime_error("Invalid anchor point found");
-#endif
-      msg_warning << "Invalid anchor point found" << std::endl;
+      log_warning << "Invalid anchor point found" << std::endl;
       result.x = rect.get_left();
       break;
   }
@@ -92,22 +107,19 @@ Vector get_anchor_pos(const Rect& rect, AnchorPoint point)
       result.y = rect.get_bottom();
       break;
     default:
-#ifdef DEBUG
-      throw std::runtime_error("Invalid anchor point found");
-#endif
-      msg_warning << "Invalid anchor point found" << std::endl;
+      log_warning << "Invalid anchor point found" << std::endl;
       result.y = rect.get_top();
       break;
   }
-  
+
   return result;
 }
 
-Vector get_anchor_pos(const Rect& destrect, float width, float height,
+Vector get_anchor_pos(const Rectf& destrect, float width, float height,
                       AnchorPoint point)
 {
   Vector result;
-  
+
   switch(point & ANCHOR_V_MASK) {
     case ANCHOR_LEFT:
       result.x = destrect.get_left();
@@ -119,10 +131,7 @@ Vector get_anchor_pos(const Rect& destrect, float width, float height,
       result.x = destrect.get_right() - width;
       break;
     default:
-#ifdef DEBUG
-      throw std::runtime_error("Invalid anchor point found");
-#endif
-      msg_warning << "Invalid anchor point found" << std::endl;
+      log_warning << "Invalid anchor point found" << std::endl;
       result.x = destrect.get_left();
       break;
   }
@@ -138,14 +147,12 @@ Vector get_anchor_pos(const Rect& destrect, float width, float height,
       result.y = destrect.get_bottom() - height;
       break;
     default:
-#ifdef DEBUG
-      throw std::runtime_error("Invalid anchor point found");
-#endif
-      msg_warning << "Invalid anchor point found" << std::endl;
+      log_warning << "Invalid anchor point found" << std::endl;
       result.y = destrect.get_top();
       break;
   }
-  
-  return result; 
+
+  return result;
 }
 
+/* EOF */