Peter M. Groen / openbr

Commit 78dcab2320c998c49dab9aa8b2ebd6ac35700ee7

Authored by Josh Klontz
1 parent 63de49e7

tweaks

Inline Side-by-side
Showing 2 changed files with 19 additions and 20 deletions
sdk/openbr_plugin.cpp
  View file @78dcab2
... ... @@ -415,7 +415,7 @@ QStringList Object::arguments() const
415 415 for (int i=metaObject()->propertyOffset(); i<metaObject()->propertyCount(); i++) {
416 416 QMetaProperty property = metaObject()->property(i);
417 417 if (property.isStored(this)) continue;
418   - arguments.append(property.read(this).toString());
  418 + arguments.append(argument(i));
419 419 }
420 420 return arguments;
421 421 }
... ...
sdk/plugins/llvm.cpp
  View file @78dcab2
... ... @@ -325,9 +325,7 @@ public:
325 325  
326 326 private:
327 327 QString mangledName(const Matrix &m) const {
328   - QStringList kernelArguments;
329   - for (int i=metaObject()->propertyOffset(); i<metaObject()->propertyCount(); i++)
330   - kernelArguments.append(metaObject()->property(i).read(this).toString());
  328 + QStringList kernelArguments = arguments();
331 329 kernelArguments.append(m.toString());
332 330 return "jitcv_" + name().remove("Transform") + "_" + kernelArguments.join("_");
333 331 }
... ... @@ -531,7 +529,8 @@ BR_REGISTER(Transform, powTransform)
531 529 * \ingroup transforms
532 530 * \brief LLVM sum transform
533 531 * \author Josh Klontz \cite jklontz
534   - */class sumTransform : public Kernel
  532 + */
  533 +class sumTransform : public Kernel
535 534 {
536 535 Q_OBJECT
537 536 Q_PROPERTY(bool channels READ get_channels WRITE set_channels RESET reset_channels STORED false)
... ... @@ -779,7 +778,7 @@ class _QuantizeTransform : public Transform
779 778 }
780 779 };
781 780  
782   -//BR_REGISTER(Transform, _QuantizeTransform)
  781 +BR_REGISTER(Transform, _QuantizeTransform)
783 782  
784 783 /*!
785 784 * \ingroup initializers
... ... @@ -822,24 +821,24 @@ class LLVMInitializer : public Initializer
822 821 Type::getInt16Ty(getGlobalContext()), // hash
823 822 NULL);
824 823  
825   - QSharedPointer<Transform> kernel(Transform::make("abs", NULL));
  824 +// QSharedPointer<Transform> kernel(Transform::make("abs", NULL));
826 825  
827   - Template src, dst;
828   - src.m() = (Mat_<qint8>(2,2) << -1, -2, 3, 4);
829   - kernel->project(src, dst);
830   - qDebug() << dst.m();
  826 +// Template src, dst;
  827 +// src.m() = (Mat_<qint8>(2,2) << -1, -2, 3, 4);
  828 +// kernel->project(src, dst);
  829 +// qDebug() << dst.m();
831 830  
832   - src.m() = (Mat_<qint32>(2,2) << -1, -3, 9, 27);
833   - kernel->project(src, dst);
834   - qDebug() << dst.m();
  831 +// src.m() = (Mat_<qint32>(2,2) << -1, -3, 9, 27);
  832 +// kernel->project(src, dst);
  833 +// qDebug() << dst.m();
835 834  
836   - src.m() = (Mat_<float>(2,2) << -1.5, -2.5, 3.5, 4.5);
837   - kernel->project(src, dst);
838   - qDebug() << dst.m();
  835 +// src.m() = (Mat_<float>(2,2) << -1.5, -2.5, 3.5, 4.5);
  836 +// kernel->project(src, dst);
  837 +// qDebug() << dst.m();
839 838  
840   - src.m() = (Mat_<double>(2,2) << 1.75, 2.75, -3.75, -4.75);
841   - kernel->project(src, dst);
842   - qDebug() << dst.m();
  839 +// src.m() = (Mat_<double>(2,2) << 1.75, 2.75, -3.75, -4.75);
  840 +// kernel->project(src, dst);
  841 +// qDebug() << dst.m();
843 842 }
844 843  
845 844 void finalize() const
... ...