explicitly mention video player and grabber, swap video for updated v…

…ideo
kylemcdonald · Mar 4, 2016 · d0cfc01 · d0cfc01
1 parent 05245f8
commit d0cfc01
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/example-contours-tracking/addons.make b/example-contours-tracking/addons.make
@@ -1,3 +1,3 @@
 ofxCv
+ofxGui
 ofxOpenCv
-ofxGui
diff --git a/example-contours-tracking/bin/data/video.mov b/example-contours-tracking/bin/data/video.mov
diff --git a/example-empty/addons.make b/example-empty/addons.make
@@ -1,3 +1,3 @@
 ofxCv
+ofxGui
 ofxOpenCv
-ofxGui
diff --git a/libs/ofxCv/include/ofxCv/Utilities.h b/libs/ofxCv/include/ofxCv/Utilities.h
@@ -14,6 +14,8 @@
 #include "ofTexture.h"
 #include "ofPixels.h"
 #include "ofBaseTypes.h"
+#include "ofVideoPlayer.h"
+#include "ofVideoGrabber.h"
 #include "ofPolyline.h"
 #include "ofVectorMath.h"
 
@@ -177,7 +179,7 @@ namespace ofxCv {
         {
             img.allocate(width, height, getOfImageType(cvType));
         }
-	}
+    }
     inline void allocate(ofTexture& img, int width, int height, int cvType) {
         if (!img.isAllocated() ||
             getWidth(img) != width ||
@@ -195,7 +197,9 @@ namespace ofxCv {
 		}
 	}
 	// ofVideoPlayer/Grabber can't be allocated, so we assume we don't need to do anything
-	inline void allocate(ofBaseVideoDraws & img, int width, int height, int cvType) {}
+    inline void allocate(ofBaseVideoDraws & img, int width, int height, int cvType) {}
+    inline void allocate(ofVideoPlayer & img, int width, int height, int cvType) {}
+    inline void allocate(ofVideoGrabber & img, int width, int height, int cvType) {}
 
 	// imitate() is good for preparing buffers
 	// it's like allocate(), but uses the size and type of the original as a reference