Avoid duplicate checks in CoordCache

The code is written in such a way that the elements are searched
several times. This can be expensive when there are a lots of insets
in the document.

Concerning the sanity checks, they are now conditionned on the
presence of assertion.

Related to bug #12297.

diff --git a/src/CoordCache.h b/src/CoordCache.h
index 44ac26c66de5232a4714cf2d7af49a8e737eab76..b99cbe6ddd1d5ccb674d8b896a901efba766bbcf 100644 (file)
--- a/src/CoordCache.h
+++ b/src/CoordCache.h
@@ -26,7 +26,7 @@ class MathData;
 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
@@ -75,8 +75,6 @@ public:
 
        void add(T const * thing, Dimension const & dim)
        {
-               if (!has(thing))
-                       data_[thing].pos = Point(-10000, -10000);
                data_[thing].dim = dim;
        }
 
@@ -147,6 +145,7 @@ public:
 private:
        friend class CoordCache;
 
+#ifdef ENABLE_ASSERTIONS
        void checkDim(T const * thing, char const * hint) const
        {
                if (!hasDim(thing))
@@ -158,6 +157,11 @@ 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::unordered_map<T const *, Geometry> cache_type;
        cache_type data_;