Replace deprecated initGrabber() function with setup().

kylemcdonald · Oct 27, 2015 · 7b6f62b · 7b6f62b
1 parent 5078f61
commit 7b6f62b
Show file tree

Hide file tree

Showing 21 changed files with 21 additions and 21 deletions.
diff --git a/example-ar/src/ofApp.cpp b/example-ar/src/ofApp.cpp
@@ -5,7 +5,7 @@ using namespace cv;
 
 void ofApp::setup() {
 	ofSetVerticalSync(true);
-	cam.initGrabber(640, 480);
+	cam.setup(640, 480);
 
 	calibration.load("mbp-2011-isight.yml");
 	patternSize = calibration.getPatternSize();

diff --git a/example-background/src/ofApp.cpp b/example-background/src/ofApp.cpp
@@ -4,7 +4,7 @@ using namespace ofxCv;
 using namespace cv;
 
 void ofApp::setup() {
-	cam.initGrabber(640, 480);
+	cam.setup(640, 480);
 	background.setLearningTime(900);
 	background.setThresholdValue(10);
 }

diff --git a/example-blur/src/ofApp.cpp b/example-blur/src/ofApp.cpp
@@ -2,7 +2,7 @@
 
 void ofApp::setup() {
     useGaussian = false;
-    cam.initGrabber(640, 480);
+    cam.setup(640, 480);
 }
 
 void ofApp::update() {

diff --git a/example-calibration/src/ofApp.cpp b/example-calibration/src/ofApp.cpp
@@ -9,7 +9,7 @@ const int startCleaning = 10; // start cleaning outliers after this many samples
 
 void ofApp::setup() {
 	ofSetVerticalSync(true);
-	cam.initGrabber(640, 480);
+	cam.setup(640, 480);
 
 	FileStorage settings(ofToDataPath("settings.yml"), FileStorage::READ);
 	if(settings.isOpened()) {

diff --git a/example-contours-advanced/src/ofApp.cpp b/example-contours-advanced/src/ofApp.cpp
@@ -4,7 +4,7 @@ using namespace ofxCv;
 using namespace cv;
 
 void ofApp::setup() {
-	cam.initGrabber(640, 480);
+	cam.setup(640, 480);
 	contourFinder.setMinAreaRadius(10);
 	contourFinder.setMaxAreaRadius(150);
 	//contourFinder.setInvert(true); // find black instead of white

diff --git a/example-contours-basic/src/ofApp.cpp b/example-contours-basic/src/ofApp.cpp
@@ -4,7 +4,7 @@ using namespace ofxCv;
 using namespace cv;
 
 void ofApp::setup() {
-	cam.initGrabber(640, 480);
+	cam.setup(640, 480);
 	contourFinder.setMinAreaRadius(10);
 	contourFinder.setMaxAreaRadius(200);
 }

diff --git a/example-contours-color/src/ofApp.cpp b/example-contours-color/src/ofApp.cpp
@@ -4,7 +4,7 @@ using namespace ofxCv;
 using namespace cv;
 
 void ofApp::setup() {
-	cam.initGrabber(640, 480);
+	cam.setup(640, 480);
 	contourFinder.setMinAreaRadius(10);
 	contourFinder.setMaxAreaRadius(200);
 	trackingColorMode = TRACK_COLOR_RGB;

diff --git a/example-contours-quad/src/ofApp.cpp b/example-contours-quad/src/ofApp.cpp
@@ -4,7 +4,7 @@ using namespace ofxCv;
 using namespace cv;
 
 void ofApp::setup() {
-	cam.initGrabber(640, 480);
+	cam.setup(640, 480);
 	contourFinder.setMinAreaRadius(10);
 	contourFinder.setMaxAreaRadius(200);
 	unwarped.allocate(150, 100, OF_IMAGE_COLOR);

diff --git a/example-difference-columns/src/ofApp.cpp b/example-difference-columns/src/ofApp.cpp
@@ -5,7 +5,7 @@ using namespace cv;
 
 void ofApp::setup() {
 	ofSetVerticalSync(true);
-	cam.initGrabber(320, 240);
+	cam.setup(320, 240);
 
 	// imitate() will set up previous and diff
 	// so they have the same size and type as cam

diff --git a/example-difference/src/ofApp.cpp b/example-difference/src/ofApp.cpp
@@ -5,7 +5,7 @@ using namespace cv;
 
 void ofApp::setup() {
 	ofSetVerticalSync(true);
-	cam.initGrabber(320, 240);
+	cam.setup(320, 240);
 
 	// imitate() will set up previous and diff
 	// so they have the same size and type as cam

diff --git a/example-edge/src/ofApp.cpp b/example-edge/src/ofApp.cpp
@@ -4,7 +4,7 @@ using namespace ofxCv;
 using namespace cv;
 
 void ofApp::setup() {
-	cam.initGrabber(640, 480);
+	cam.setup(640, 480);
 }
 
 void ofApp::update() {

diff --git a/example-face-follow/src/ofApp.cpp b/example-face-follow/src/ofApp.cpp
@@ -9,7 +9,7 @@ void ofApp::setup() {
 	finder.setup("haarcascade_frontalface_default.xml");
 	finder.setPreset(ObjectFinder::Fast);
 	finder.getTracker().setSmoothingRate(.3);
-	cam.initGrabber(640, 480);
+	cam.setup(640, 480);
 	sunglasses.load("sunglasses.png");
 	ofEnableAlphaBlending();
 }

diff --git a/example-face-zoom/src/ofApp.cpp b/example-face-zoom/src/ofApp.cpp
@@ -9,7 +9,7 @@ void ofApp::setup() {
 
 	objectFinder.setup(ofToDataPath("haarcascade_frontalface_default.xml"));
 	objectFinder.setPreset(ObjectFinder::Fast);
-	cam.initGrabber(640, 480);
+	cam.setup(640, 480);
 	cropped.allocate(ofGetWidth(), ofGetHeight(), OF_IMAGE_COLOR);
 }
 

diff --git a/example-face/src/ofApp.cpp b/example-face/src/ofApp.cpp
@@ -8,7 +8,7 @@ void ofApp::setup() {
 	ofSetFrameRate(120);
     finder.setup("haarcascade_frontalface_default.xml");
     finder.setPreset(ObjectFinder::Fast);
-	cam.initGrabber(640, 480);
+	cam.setup(640, 480);
 }
 
 void ofApp::update() {

diff --git a/example-flow-distort-shader/src/ofApp.cpp b/example-flow-distort-shader/src/ofApp.cpp
@@ -4,7 +4,7 @@ using namespace ofxCv;
 using namespace cv;
 
 void ofApp::setup() {
-	cam.initGrabber(1280, 720);
+	cam.setup(1280, 720);
     motionAmplifier.setup(cam.getWidth(), cam.getHeight(), 2, .25);
 }
 

diff --git a/example-flow-distort/src/ofApp.cpp b/example-flow-distort/src/ofApp.cpp
@@ -6,7 +6,7 @@ using namespace cv;
 void ofApp::setup() {
 	ofSetVerticalSync(true);
 	ofSetFrameRate(120);
-	cam.initGrabber(320, 240);
+	cam.setup(320, 240);
 
 	mesh.setMode(OF_PRIMITIVE_TRIANGLES);
 	stepSize = 8;

diff --git a/example-flow-keypoints/src/ofApp.cpp b/example-flow-keypoints/src/ofApp.cpp
@@ -4,7 +4,7 @@ using namespace cv;
 using namespace ofxCv;
 
 void ofApp::setup(){
-	grabber.initGrabber(640,480);
+	grabber.setup(640,480);
 }
 
 void ofApp::update(){

diff --git a/example-flow/src/ofApp.cpp b/example-flow/src/ofApp.cpp
@@ -6,7 +6,7 @@ using namespace cv;
 void ofApp::setup() {
     ofBackground(0);
 
-	camera.initGrabber(320, 240);
+	camera.setup(320, 240);
 
     gui.setup();
 

diff --git a/example-smile/src/ofApp.cpp b/example-smile/src/ofApp.cpp
@@ -6,7 +6,7 @@ using namespace cv;
 void ofApp::setup() {
     ofSetVerticalSync(true);
     ofSetFrameRate(120);
-    cam.initGrabber(640, 480);
+    cam.setup(640, 480);
     smile.setup();
 }
 

diff --git a/example-threshold/src/ofApp.cpp b/example-threshold/src/ofApp.cpp
@@ -4,7 +4,7 @@ using namespace cv;
 using namespace ofxCv;
 
 void ofApp::setup() {
-	cam.initGrabber(640, 480);
+	cam.setup(640, 480);
 	thresh.allocate(640, 480, OF_IMAGE_GRAYSCALE);
 }
 

diff --git a/example-undistortion/src/ofApp.cpp b/example-undistortion/src/ofApp.cpp
@@ -5,7 +5,7 @@ using namespace cv;
 
 void ofApp::setup() {
 	ofSetVerticalSync(true);
-	cam.initGrabber(640, 480);
+	cam.setup(640, 480);
 	calibration.setFillFrame(true); // true by default
 	calibration.load("mbp-2011-isight.yml");
 	imitate(undistorted, cam);