From 1ed1fe558cc1f189a83658dbe6a1a20abe8ecb5b Mon Sep 17 00:00:00 2001 From: Charles Otto Date: Thu, 1 Aug 2013 19:15:06 -0400 Subject: [PATCH] Remove an exceedingly pointless copy from CompositeTransform --- openbr/plugins/openbr_internal.h | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/openbr/plugins/openbr_internal.h b/openbr/plugins/openbr_internal.h index fb7a1b5..2f42e50 100644 --- a/openbr/plugins/openbr_internal.h +++ b/openbr/plugins/openbr_internal.h @@ -170,14 +170,8 @@ public: virtual void project(const TemplateList &src, TemplateList &dst) const { if (timeVarying()) { - if (!this->timeInvariantAlias) { - QMutexLocker lock(&aliasLock); - CompositeTransform * non_const = const_cast(this); - non_const->timeInvariantAlias = non_const->smartCopy(); - non_const->timeInvariantAlias->setParent(non_const); - lock.unlock(); - } - timeInvariantAlias->projectUpdate(src,dst); + CompositeTransform * non_const = const_cast(this); + non_const->projectUpdate(src,dst); return; } _project(src, dst); @@ -237,13 +231,10 @@ public: protected: bool isTimeVarying; - mutable QMutex aliasLock; - Transform * timeInvariantAlias; - virtual void _project(const Template & src, Template & dst) const = 0; virtual void _project(const TemplateList & src, TemplateList & dst) const = 0; - CompositeTransform() : TimeVaryingTransform(false) { timeInvariantAlias = NULL; } + CompositeTransform() : TimeVaryingTransform(false) {} }; } -- libgit2 0.21.4