diff --git a/openbr/openbr_plugin.h b/openbr/openbr_plugin.h index 2375a0f..be6a583 100644 --- a/openbr/openbr_plugin.h +++ b/openbr/openbr_plugin.h @@ -1408,7 +1408,7 @@ public: virtual cv::Mat evaluate(const cv::Mat &image, const QList &indices = QList()) const = 0; virtual cv::Size windowSize(int *dx = NULL, int *dy = NULL) const = 0; // dx and dy should indicate the change to the original window size after preprocessing - virtual int numChannels() const { return 1; }; + virtual int numChannels() const { return 1; } virtual int numFeatures() const = 0; virtual int maxCatCount() const = 0; }; diff --git a/openbr/plugins/classification/boostedforest.cpp b/openbr/plugins/classification/boostedforest.cpp index ad1236c..0b2e027 100644 --- a/openbr/plugins/classification/boostedforest.cpp +++ b/openbr/plugins/classification/boostedforest.cpp @@ -88,7 +88,7 @@ class BoostedForestClassifier : public Classifier Q_OBJECT Q_ENUMS(Type) - Q_PROPERTY(br::Representation *representation READ get_representation WRITE set_representation RESET reset_representation STORED false) + Q_PROPERTY(br::Representation* representation READ get_representation WRITE set_representation RESET reset_representation STORED false) Q_PROPERTY(float minTAR READ get_minTAR WRITE set_minTAR RESET reset_minTAR STORED false) Q_PROPERTY(float maxFAR READ get_maxFAR WRITE set_maxFAR RESET reset_maxFAR STORED false) Q_PROPERTY(float trimRate READ get_trimRate WRITE set_trimRate RESET reset_trimRate STORED false) @@ -102,7 +102,7 @@ public: Logit = CvBoost::LOGIT, Gentle = CvBoost::GENTLE}; private: - BR_PROPERTY(br::Representation *, representation, NULL) + BR_PROPERTY(br::Representation*, representation, NULL) BR_PROPERTY(float, minTAR, 0.995) BR_PROPERTY(float, maxFAR, 0.5) BR_PROPERTY(float, trimRate, 0.95) diff --git a/openbr/plugins/imgproc/slidingwindow.cpp b/openbr/plugins/imgproc/slidingwindow.cpp index 6357a3e..22845af 100644 --- a/openbr/plugins/imgproc/slidingwindow.cpp +++ b/openbr/plugins/imgproc/slidingwindow.cpp @@ -35,7 +35,7 @@ class SlidingWindowTransform : public MetaTransform { Q_OBJECT - Q_PROPERTY(br::Classifier *classifier READ get_classifier WRITE set_classifier RESET reset_classifier STORED false) + Q_PROPERTY(br::Classifier* classifier READ get_classifier WRITE set_classifier RESET reset_classifier STORED false) Q_PROPERTY(int minSize READ get_minSize WRITE set_minSize RESET reset_minSize STORED false) Q_PROPERTY(int maxSize READ get_maxSize WRITE set_maxSize RESET reset_maxSize STORED false) @@ -44,7 +44,7 @@ class SlidingWindowTransform : public MetaTransform Q_PROPERTY(float confidenceThreshold READ get_confidenceThreshold WRITE set_confidenceThreshold RESET reset_confidenceThreshold STORED false) Q_PROPERTY(float eps READ get_eps WRITE set_eps RESET reset_eps STORED false) - BR_PROPERTY(br::Classifier *, classifier, NULL) + BR_PROPERTY(br::Classifier*, classifier, NULL) BR_PROPERTY(int, minSize, 20) BR_PROPERTY(int, maxSize, -1) BR_PROPERTY(float, scaleFactor, 1.2)