Hotfix loading resources other than webcams

shoeffner · Jan 26, 2017 · d771f7d · d771f7d
1 parent 8e4fcb8
commit d771f7d
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/README.rst b/README.rst
@@ -35,7 +35,8 @@ Provides cvloop, a way to show opencv video loops. Designed for jupyter notebook
 Requirements
 ------------
 
-(Recommended versions, additionally tested versions in parentheses)
+(Recommended versions, additionally tested versions in parentheses.)
+
 -  Python 3.6 (3.5)
 -  OpenCV 3.2 (3.1)
 -  Jupyter 4.3.1

diff --git a/cvloop/__init__.py b/cvloop/__init__.py
@@ -2,7 +2,7 @@
 jupyter notebooks."""
 import sys
 
-__version__ = '0.3.0'
+__version__ = '0.3.1'
 
 OPENCV_FOUND = False
 OPENCV_VERSION_COMPATIBLE = False

diff --git a/cvloop/cvloop.py b/cvloop/cvloop.py
@@ -75,10 +75,12 @@ def __init__(self, source=None, function=lambda x: x, side_by_side=False,
                            dimensions, color channels, data type. Skips the
                            output of one frame.
         """
-        if source is not None and \
-                (isinstance(source, type(cv2.VideoCapture())) or
-                 hasattr(source, 'read')):
-            self.capture = source
+        if source is not None:
+            if isinstance(source, type(cv2.VideoCapture())) \
+                    or hasattr(source, 'read'):
+                self.capture = source
+            else:
+                self.capture = cv2.VideoCapture(source)
         else:
             self.capture = cv2.VideoCapture(0)
 

diff --git a/setup.py b/setup.py
@@ -4,7 +4,7 @@
 import sys
 
 
-VERSION = '0.3.0' # x.y.z[-dev#]
+VERSION = '0.3.1' # x.y.z[-dev#]
 REPOSITORY = 'https://github.com/shoeffner/cvloop'
 
 README = ''