Commit 1ed1fe558cc1f189a83658dbe6a1a20abe8ecb5b

Authored by Charles Otto
1 parent 8b3c745f

Remove an exceedingly pointless copy from CompositeTransform

openbr/plugins/openbr_internal.h
@@ -170,14 +170,8 @@ public: @@ -170,14 +170,8 @@ public:
170 virtual void project(const TemplateList &src, TemplateList &dst) const 170 virtual void project(const TemplateList &src, TemplateList &dst) const
171 { 171 {
172 if (timeVarying()) { 172 if (timeVarying()) {
173 - if (!this->timeInvariantAlias) {  
174 - QMutexLocker lock(&aliasLock);  
175 - CompositeTransform * non_const = const_cast<CompositeTransform *>(this);  
176 - non_const->timeInvariantAlias = non_const->smartCopy();  
177 - non_const->timeInvariantAlias->setParent(non_const);  
178 - lock.unlock();  
179 - }  
180 - timeInvariantAlias->projectUpdate(src,dst); 173 + CompositeTransform * non_const = const_cast<CompositeTransform *>(this);
  174 + non_const->projectUpdate(src,dst);
181 return; 175 return;
182 } 176 }
183 _project(src, dst); 177 _project(src, dst);
@@ -237,13 +231,10 @@ public: @@ -237,13 +231,10 @@ public:
237 protected: 231 protected:
238 bool isTimeVarying; 232 bool isTimeVarying;
239 233
240 - mutable QMutex aliasLock;  
241 - Transform * timeInvariantAlias;  
242 -  
243 virtual void _project(const Template & src, Template & dst) const = 0; 234 virtual void _project(const Template & src, Template & dst) const = 0;
244 virtual void _project(const TemplateList & src, TemplateList & dst) const = 0; 235 virtual void _project(const TemplateList & src, TemplateList & dst) const = 0;
245 236
246 - CompositeTransform() : TimeVaryingTransform(false) { timeInvariantAlias = NULL; } 237 + CompositeTransform() : TimeVaryingTransform(false) {}
247 }; 238 };
248 239
249 } 240 }