Peter M. Groen / openbr

Commit 25bb2b8608eaaf15aad99a41f07dddfa5870840c

Authored by Scott Klum
1 parent e6f80e5e

Minor cleanup

Inline Side-by-side
Showing 3 changed files with 5 additions and 5 deletions
openbr/openbr_plugin.h
  View file @25bb2b8
... ... @@ -1408,7 +1408,7 @@ public:
1408 1408 virtual cv::Mat evaluate(const cv::Mat &image, const QList<int> &indices = QList<int>()) const = 0;
1409 1409  
1410 1410 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
1411   - virtual int numChannels() const { return 1; };
  1411 + virtual int numChannels() const { return 1; }
1412 1412 virtual int numFeatures() const = 0;
1413 1413 virtual int maxCatCount() const = 0;
1414 1414 };
... ...
openbr/plugins/classification/boostedforest.cpp
  View file @25bb2b8
... ... @@ -88,7 +88,7 @@ class BoostedForestClassifier : public Classifier
88 88 Q_OBJECT
89 89 Q_ENUMS(Type)
90 90  
91   - Q_PROPERTY(br::Representation *representation READ get_representation WRITE set_representation RESET reset_representation STORED false)
  91 + Q_PROPERTY(br::Representation* representation READ get_representation WRITE set_representation RESET reset_representation STORED false)
92 92 Q_PROPERTY(float minTAR READ get_minTAR WRITE set_minTAR RESET reset_minTAR STORED false)
93 93 Q_PROPERTY(float maxFAR READ get_maxFAR WRITE set_maxFAR RESET reset_maxFAR STORED false)
94 94 Q_PROPERTY(float trimRate READ get_trimRate WRITE set_trimRate RESET reset_trimRate STORED false)
... ... @@ -102,7 +102,7 @@ public:
102 102 Logit = CvBoost::LOGIT,
103 103 Gentle = CvBoost::GENTLE};
104 104 private:
105   - BR_PROPERTY(br::Representation *, representation, NULL)
  105 + BR_PROPERTY(br::Representation*, representation, NULL)
106 106 BR_PROPERTY(float, minTAR, 0.995)
107 107 BR_PROPERTY(float, maxFAR, 0.5)
108 108 BR_PROPERTY(float, trimRate, 0.95)
... ...
openbr/plugins/imgproc/slidingwindow.cpp
  View file @25bb2b8
... ... @@ -35,7 +35,7 @@ class SlidingWindowTransform : public MetaTransform
35 35 {
36 36 Q_OBJECT
37 37  
38   - Q_PROPERTY(br::Classifier *classifier READ get_classifier WRITE set_classifier RESET reset_classifier STORED false)
  38 + Q_PROPERTY(br::Classifier* classifier READ get_classifier WRITE set_classifier RESET reset_classifier STORED false)
39 39  
40 40 Q_PROPERTY(int minSize READ get_minSize WRITE set_minSize RESET reset_minSize STORED false)
41 41 Q_PROPERTY(int maxSize READ get_maxSize WRITE set_maxSize RESET reset_maxSize STORED false)
... ... @@ -44,7 +44,7 @@ class SlidingWindowTransform : public MetaTransform
44 44 Q_PROPERTY(float confidenceThreshold READ get_confidenceThreshold WRITE set_confidenceThreshold RESET reset_confidenceThreshold STORED false)
45 45 Q_PROPERTY(float eps READ get_eps WRITE set_eps RESET reset_eps STORED false)
46 46  
47   - BR_PROPERTY(br::Classifier *, classifier, NULL)
  47 + BR_PROPERTY(br::Classifier*, classifier, NULL)
48 48 BR_PROPERTY(int, minSize, 20)
49 49 BR_PROPERTY(int, maxSize, -1)
50 50 BR_PROPERTY(float, scaleFactor, 1.2)
... ...