Commit cbbf20792274d0b4f6c05a2f7b2b00637bbec875

Authored by Jordan Cheney
2 parents b012abb1 3331fb37

merge fixes

Showing 1 changed file with 1 additions and 1 deletions
openbr/openbr_plugin.h
@@ -1178,7 +1178,7 @@ public: @@ -1178,7 +1178,7 @@ public:
1178 1178
1179 virtual ~Transform() {} 1179 virtual ~Transform() {}
1180 static Transform *make(QString str, QObject *parent); /*!< \brief Make a transform from a string. */ 1180 static Transform *make(QString str, QObject *parent); /*!< \brief Make a transform from a string. */
1181 - static QSharedPointer<Transform> fromAlgorithm(const QString &algorithm, bool preprocess=true); /*!< \brief Retrieve an algorithm's transform. If preprocess is true, attaches a stream transform as the root of the algorithm*/ 1181 + static QSharedPointer<Transform> fromAlgorithm(const QString &algorithm, bool preprocess=false); /*!< \brief Retrieve an algorithm's transform. If preprocess is true, attaches a stream transform as the root of the algorithm*/
1182 static QSharedPointer<Transform> fromComparison(const QString &algorithm); 1182 static QSharedPointer<Transform> fromComparison(const QString &algorithm);
1183 1183
1184 virtual Transform *clone() const; /*!< \brief Copy the transform. */ 1184 virtual Transform *clone() const; /*!< \brief Copy the transform. */