Commit 09c5e8cc authored by Jiri Horner's avatar Jiri Horner

replace internal usage of deprecated estimateRigidTransform in face

* face module now links to calib3d instead of video module
parent 9adf7a58
...@@ -2,7 +2,7 @@ set(the_description "Face recognition etc") ...@@ -2,7 +2,7 @@ set(the_description "Face recognition etc")
ocv_define_module(face opencv_core ocv_define_module(face opencv_core
opencv_imgproc opencv_imgproc
opencv_objdetect opencv_objdetect
opencv_video # estimateRigidTransform() (trainFacemark) opencv_calib3d # estimateAffinePartial2D() (trainFacemark)
opencv_photo # seamlessClone() (face_swap sample) opencv_photo # seamlessClone() (face_swap sample)
WRAP python java WRAP python java
) )
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
#include "precomp.hpp" #include "precomp.hpp"
#include "face_alignmentimpl.hpp" #include "face_alignmentimpl.hpp"
#include "opencv2/video/tracking.hpp" #include "opencv2/calib3d.hpp"
#include <climits> #include <climits>
using namespace std; using namespace std;
...@@ -123,7 +123,7 @@ bool FacemarkKazemiImpl :: getRelativePixels(vector<Point2f> sample,vector<Point ...@@ -123,7 +123,7 @@ bool FacemarkKazemiImpl :: getRelativePixels(vector<Point2f> sample,vector<Point
CV_Error(Error::StsBadArg, error_message); CV_Error(Error::StsBadArg, error_message);
} }
Mat transform_mat; Mat transform_mat;
transform_mat = estimateRigidTransform(meanshape,sample,false); transform_mat = estimateAffinePartial2D(meanshape, sample);
unsigned long index; unsigned long index;
for (unsigned long i = 0;i<pixel_coordinates.size();i++) { for (unsigned long i = 0;i<pixel_coordinates.size();i++) {
if(!nearest.empty()) if(!nearest.empty())
......
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