X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCoordCache.h;h=f26b6b22dd523791b9c73536f4488356d2649653;hb=4ed0312c51704780af1c452d3a82a84171b3725a;hp=9871819c10aa1d1a961c7c01b094b7778572fc7d;hpb=26eb5092fb69464d181caaf212d6a4d9c9cff2f0;p=lyx.git

diff --git a/src/CoordCache.h b/src/CoordCache.h
index 9871819c10..f26b6b22dd 100644
--- a/src/CoordCache.h
+++ b/src/CoordCache.h
@@ -16,27 +16,23 @@
 
 #include "Dimension.h"
 
-#include <map>
+#include <unordered_map>
 
 namespace lyx {
 
 class Inset;
-class Text;
 class MathData;
-class Paragraph;
 
 void lyxbreaker(void const * data, const char * hint, int size);
 
 struct Geometry {
-	Point pos;
+	Point pos = {-10000, -10000 };
 	Dimension dim;
 
 	bool covers(int x, int y) const
 	{
-		return x >= pos.x_
-			&& x <= pos.x_ + dim.wid
-			&& y >= pos.y_ - dim.asc
-			&& y <= pos.y_ + dim.des;
+		return x >= pos.x_ && x < pos.x_ + dim.wid
+		       && y >= pos.y_ - dim.asc && y <= pos.y_ + dim.des;
 	}
 
 	int squareDistance(int x, int y) const
@@ -79,14 +75,18 @@ public:
 
 	void add(T const * thing, Dimension const & dim)
 	{
-		if (!has(thing))
-			data_[thing].pos = Point(-10000, -10000);
 		data_[thing].dim = dim;
 	}
 
+	Geometry & geometry(T const * thing)
+	{
+		checkDim(thing, "geometry");
+		return data_.find(thing)->second;
+	}
+
 	Geometry const & geometry(T const * thing) const
 	{
-		check(thing, "geometry");
+		checkDim(thing, "geometry");
 		return data_.find(thing)->second;
 	}
 
@@ -145,6 +145,7 @@ public:
 private:
 	friend class CoordCache;
 
+#ifdef ENABLE_ASSERTIONS
 	void checkDim(T const * thing, char const * hint) const
 	{
 		if (!hasDim(thing))
@@ -156,8 +157,13 @@ private:
 		if (!has(thing))
 			lyxbreaker(thing, hint, data_.size());
 	}
+#else
+	void checkDim(T const *, char const * const ) const {}
+
+	void check(T const *, char const *) const {}
+#endif
 
-	typedef std::map<T const *, Geometry> cache_type;
+	typedef std::unordered_map<T const *, Geometry> cache_type;
 	cache_type data_;
 };