Commit 62b4709b authored by Alexander Alekhin's avatar Alexander Alekhin

saliency: apply CV_OVERRIDE/CV_FINAL

parent 5d0a1283
...@@ -103,7 +103,7 @@ class CV_EXPORTS_W StaticSaliency : public virtual Saliency ...@@ -103,7 +103,7 @@ class CV_EXPORTS_W StaticSaliency : public virtual Saliency
*/ */
CV_WRAP bool computeBinaryMap( InputArray _saliencyMap, OutputArray _binaryMap ); CV_WRAP bool computeBinaryMap( InputArray _saliencyMap, OutputArray _binaryMap );
protected: protected:
virtual bool computeSaliencyImpl( InputArray image, OutputArray saliencyMap )=0; virtual bool computeSaliencyImpl( InputArray image, OutputArray saliencyMap ) CV_OVERRIDE = 0;
}; };
...@@ -112,7 +112,7 @@ class CV_EXPORTS_W MotionSaliency : public virtual Saliency ...@@ -112,7 +112,7 @@ class CV_EXPORTS_W MotionSaliency : public virtual Saliency
{ {
protected: protected:
virtual bool computeSaliencyImpl( InputArray image, OutputArray saliencyMap )=0; virtual bool computeSaliencyImpl( InputArray image, OutputArray saliencyMap ) CV_OVERRIDE = 0;
}; };
...@@ -121,7 +121,7 @@ class CV_EXPORTS_W Objectness : public virtual Saliency ...@@ -121,7 +121,7 @@ class CV_EXPORTS_W Objectness : public virtual Saliency
{ {
protected: protected:
virtual bool computeSaliencyImpl( InputArray image, OutputArray saliencyMap )=0; virtual bool computeSaliencyImpl( InputArray image, OutputArray saliencyMap ) CV_OVERRIDE = 0;
}; };
......
...@@ -86,8 +86,8 @@ public: ...@@ -86,8 +86,8 @@ public:
return computeSaliencyImpl( image, saliencyMap ); return computeSaliencyImpl( image, saliencyMap );
} }
CV_WRAP void read( const FileNode& fn ); CV_WRAP void read( const FileNode& fn ) CV_OVERRIDE;
void write( FileStorage& fs ) const; void write( FileStorage& fs ) const CV_OVERRIDE;
CV_WRAP int getImageWidth() const CV_WRAP int getImageWidth() const
{ {
...@@ -107,7 +107,7 @@ public: ...@@ -107,7 +107,7 @@ public:
} }
protected: protected:
bool computeSaliencyImpl( InputArray image, OutputArray saliencyMap ); bool computeSaliencyImpl( InputArray image, OutputArray saliencyMap ) CV_OVERRIDE;
CV_PROP_RW int resImWidth; CV_PROP_RW int resImWidth;
CV_PROP_RW int resImHeight; CV_PROP_RW int resImHeight;
...@@ -140,7 +140,7 @@ public: ...@@ -140,7 +140,7 @@ public:
virtual ~StaticSaliencyFineGrained(); virtual ~StaticSaliencyFineGrained();
protected: protected:
bool computeSaliencyImpl( InputArray image, OutputArray saliencyMap ); bool computeSaliencyImpl( InputArray image, OutputArray saliencyMap ) CV_OVERRIDE;
private: private:
void calcIntensityChannel(Mat src, Mat dst); void calcIntensityChannel(Mat src, Mat dst);
...@@ -222,7 +222,7 @@ protected: ...@@ -222,7 +222,7 @@ protected:
The saliency map is given by a single *Mat* (one for each frame of an hypothetical video The saliency map is given by a single *Mat* (one for each frame of an hypothetical video
stream). stream).
*/ */
bool computeSaliencyImpl( InputArray image, OutputArray saliencyMap ); bool computeSaliencyImpl( InputArray image, OutputArray saliencyMap ) CV_OVERRIDE;
private: private:
...@@ -369,7 +369,7 @@ protected: ...@@ -369,7 +369,7 @@ protected:
specialized algorithm, the objectnessBoundingBox is a *vector\<Vec4i\>*. Each bounding box is specialized algorithm, the objectnessBoundingBox is a *vector\<Vec4i\>*. Each bounding box is
represented by a *Vec4i* for (minX, minY, maxX, maxY). represented by a *Vec4i* for (minX, minY, maxX, maxY).
*/ */
bool computeSaliencyImpl( InputArray image, OutputArray objectnessBoundingBox ); bool computeSaliencyImpl( InputArray image, OutputArray objectnessBoundingBox ) CV_OVERRIDE;
private: private:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment