rotation fix

yangsuo · May 25, 2016 · ee04df6 · ee04df6
1 parent ed0be31
commit ee04df6
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/example-simple/src/ofApp.cpp b/example-simple/src/ofApp.cpp
@@ -11,7 +11,6 @@ void ofApp::setup(){
 
     // Setup tracker
     tracker.setup();
-    tracker.setFaceRotation(90);
 }
 
 //--------------------------------------------------------------

diff --git a/src/ofxFaceTracker2.cpp b/src/ofxFaceTracker2.cpp
@@ -97,16 +97,16 @@ bool ofxFaceTracker2::update(Mat image, cv::Rect _roi) {
 		resize(image, im, cv::Size(), scale,scale, cv::INTER_NEAREST);
 	}
 
+    // Rotate image if required
+	if(imageRotation){
+		rotate_90n(im, im, imageRotation);
+	}
+
     // Update info object
     if(info.inputWidth != image.cols || info.inputHeight != image.rows){
         info = ofxFaceTracker2InputInfo(image.cols, image.rows, im.cols, im.rows, imageRotation);
     }
 
-    // Rotate image if required
-	if(imageRotation){
-		rotate_90n(im, im, imageRotation);
-	}
-
 	if(threaded) mutex.lock();
 
 	roi = _roi;

diff --git a/src/ofxFaceTracker2Landmarks.cpp b/src/ofxFaceTracker2Landmarks.cpp
@@ -9,9 +9,8 @@ ofxFaceTracker2Landmarks::ofxFaceTracker2Landmarks(dlib::full_object_detection s
 
 ofVec2f ofxFaceTracker2Landmarks::getImagePoint(int i) const {
     ofVec3f p = ofVec3f(shape.part(i).x(),
-                        shape.part(i).y(),0);
+                        shape.part(i).y(), 0);
     p = p * info.rotationMatrix;
-    ofLog()<<info.imageRotation;
 
     return ofVec2f(p);
 }