Merge pull request #113 from mgsx-dev/fix/broken-stuff

Fix/broken stuff
kylemcdonald · Jan 20, 2016 · b2b5875 · b2b5875
2 parents e754034 + 762461e
commit b2b5875
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/example-batch-process/addons.make b/example-batch-process/addons.make
@@ -1,4 +1,5 @@
 ofxCv
 ofxFaceTracker
 ofxGui
-ofxOpenCv
+ofxOpenCv
+ofxTiming
diff --git a/example-blink/src/ofApp.cpp b/example-blink/src/ofApp.cpp
@@ -172,7 +172,7 @@ void ofApp::update() {
 			rowGraph.addSample(avg - runningMean);
 			runningMean = 0;//ofLerp(runningMean, avg, .3);
 
-			Mat sobelImgMat = toCv(sobelImg);
+			cv::Mat sobelImgMat = toCv(sobelImg);
 			imitate(sobelImg, gray);
 			sobel.convertTo(sobelImgMat, CV_8U, .5);
 			sobelImg.update();

diff --git a/src/ofxFaceTracker.h b/src/ofxFaceTracker.h
@@ -15,6 +15,7 @@
 
 #pragma once
 
+#include "ofMain.h"
 #include "ofxCv.h"
 #include "FaceTracker/Tracker.h"
 #include "ExpressionClassifier.h"