Commit 134ed1db authored by jaco's avatar jaco

mac compile error fixed

parent a10fa4eb
...@@ -89,22 +89,22 @@ class CV_EXPORTS_W Saliency : public virtual Algorithm ...@@ -89,22 +89,22 @@ class CV_EXPORTS_W Saliency : public virtual Algorithm
}; };
/************************************ Static Saliency Base Class ************************************/ /************************************ Static Saliency Base Class ************************************/
class CV_EXPORTS_W StaticSaliency : public Saliency class CV_EXPORTS_W StaticSaliency : public virtual Saliency
{ {
public: public:
bool computeBinaryMap( const Mat& saliencyMap, Mat& binaryMap ); bool computeBinaryMap( const Mat& saliencyMap, Mat& binaryMap );
AlgorithmInfo* info() const = 0;
protected: protected:
virtual bool computeSaliencyImpl( const InputArray image, OutputArray saliencyMap ) = 0; virtual bool computeSaliencyImpl( const InputArray image, OutputArray saliencyMap ) = 0;
}; };
/************************************ Motion Saliency Base Class ************************************/ /************************************ Motion Saliency Base Class ************************************/
class CV_EXPORTS_W MotionSaliency : public Saliency class CV_EXPORTS_W MotionSaliency : public virtual Saliency
{ {
public:
AlgorithmInfo* info() const = 0;
protected: protected:
virtual bool computeSaliencyImpl( const InputArray image, OutputArray saliencyMap ) = 0; virtual bool computeSaliencyImpl( const InputArray image, OutputArray saliencyMap ) = 0;
...@@ -112,9 +112,10 @@ class CV_EXPORTS_W MotionSaliency : public Saliency ...@@ -112,9 +112,10 @@ class CV_EXPORTS_W MotionSaliency : public Saliency
}; };
/************************************ Objectness Base Class ************************************/ /************************************ Objectness Base Class ************************************/
class CV_EXPORTS_W Objectness : public Saliency class CV_EXPORTS_W Objectness : public virtual Saliency
{ {
public:
AlgorithmInfo* info() const = 0;
protected: protected:
virtual bool computeSaliencyImpl( const InputArray image, OutputArray saliencyMap ) = 0; virtual bool computeSaliencyImpl( const InputArray image, OutputArray saliencyMap ) = 0;
......
...@@ -164,7 +164,7 @@ class CV_EXPORTS_W ObjectnessBING : public Objectness ...@@ -164,7 +164,7 @@ class CV_EXPORTS_W ObjectnessBING : public Objectness
bool filtersLoaded() bool filtersLoaded()
{ {
int n = _svmSzIdxs.size(); int n = (int)_svmSzIdxs.size();
return n > 0 && _svmReW1f.size() == Size( 2, n ) && _svmFilter.size() == Size( _W, _W ); return n > 0 && _svmReW1f.size() == Size( 2, n ) && _svmFilter.size() == Size( _W, _W );
} }
void predictBBoxSI( CMat &mag3u, ValStructVec<float, Vec4i> &valBoxes, vecI &sz, int NUM_WIN_PSZ = 100, bool fast = true ); void predictBBoxSI( CMat &mag3u, ValStructVec<float, Vec4i> &valBoxes, vecI &sz, int NUM_WIN_PSZ = 100, bool fast = true );
......
...@@ -40,6 +40,7 @@ ...@@ -40,6 +40,7 @@
//M*/ //M*/
#pragma once #pragma once
#include "opencv2/saliency/kyheader.h"
class CmShow class CmShow
{ {
public: public:
......
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