commit 0fff65a16aed6a41bbb53958d9f5aff92984d372
Author: Jean-Marc Lasgouttes <[email protected]>
Date: Wed Oct 6 13:06:45 2021 +0200
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.
---
src/CoordCache.h | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/CoordCache.h b/src/CoordCache.h
index 44ac26c..b99cbe6 100644
--- 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_;
--
lyx-cvs mailing list
[email protected]
http://lists.lyx.org/mailman/listinfo/lyx-cvs
