Unverified Commit 2baed7e3 authored by Alexander Alekhin's avatar Alexander Alekhin Committed by GitHub

Merge pull request #1599 from dkurt:torch_embedded_residuals

Add CV_OVERRIDE
parents 2937c4ec b28069dc
...@@ -103,11 +103,11 @@ public: ...@@ -103,11 +103,11 @@ public:
bool getData(void * items) CV_OVERRIDE; bool getData(void * items) CV_OVERRIDE;
bool fitConfig( InputArray image, InputArray roi, OutputArrayOfArrays _landmarks, const std::vector<Config> &runtime_params ); bool fitConfig( InputArray image, InputArray roi, OutputArrayOfArrays _landmarks, const std::vector<Config> &runtime_params ) CV_OVERRIDE;
protected: protected:
bool fit( InputArray image, InputArray faces, OutputArrayOfArrays landmarks ); bool fit( InputArray image, InputArray faces, OutputArrayOfArrays landmarks ) CV_OVERRIDE;
//bool fit( InputArray image, InputArray faces, InputOutputArray landmarks, void * runtime_params);//!< from many ROIs //bool fit( InputArray image, InputArray faces, InputOutputArray landmarks, void * runtime_params);//!< from many ROIs
bool fitImpl( const Mat image, std::vector<Point2f>& landmarks,const Mat R,const Point2f T,const float scale, const int sclIdx=0 ); bool fitImpl( const Mat image, std::vector<Point2f>& landmarks,const Mat R,const Point2f T,const float scale, const int sclIdx=0 );
......
...@@ -115,7 +115,7 @@ public: ...@@ -115,7 +115,7 @@ public:
protected: protected:
bool fit( InputArray image, InputArray faces, OutputArrayOfArrays landmarks );//!< from many ROIs bool fit( InputArray image, InputArray faces, OutputArrayOfArrays landmarks ) CV_OVERRIDE;//!< from many ROIs
bool fitImpl( const Mat image, std::vector<Point2f> & landmarks );//!< from a face bool fitImpl( const Mat image, std::vector<Point2f> & landmarks );//!< from a face
bool addTrainingSample(InputArray image, InputArray landmarks) CV_OVERRIDE; bool addTrainingSample(InputArray image, InputArray landmarks) CV_OVERRIDE;
......
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