Skip to content

Commit 1ba1123

Browse files
Fixed: video/image not working if negative webcam index
1 parent fea4fa5 commit 1ba1123

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ OpenPose
1313

1414

1515
## Introduction
16-
OpenPose is a **library for real-time multi-person keypoint detection and multi-threading written in C++** using OpenCV and Caffe*, authored by [Gines Hidalgo](https://www.linkedin.com/in/gineshidalgo/), [Zhe Cao](http://www.andrew.cmu.edu/user/zhecao), [Tomas Simon](http://www.cs.cmu.edu/~tsimon/), [Shih-En Wei](https://scholar.google.com/citations?user=sFQD3k4AAAAJ&hl=en), [Hanbyul Joo](http://www.cs.cmu.edu/~hanbyulj/) and [Yaser Sheikh](http://www.cs.cmu.edu/~yaser/).
16+
OpenPose is a **library for real-time multi-person keypoint detection and multi-threading written in C++** using OpenCV and Caffe*, authored by [Gines Hidalgo](http://gines-hidalgo.site123.me/), [Zhe Cao](http://www.andrew.cmu.edu/user/zhecao), [Tomas Simon](http://www.cs.cmu.edu/~tsimon/), [Shih-En Wei](https://scholar.google.com/citations?user=sFQD3k4AAAAJ&hl=en), [Hanbyul Joo](http://www.cs.cmu.edu/~hanbyulj/) and [Yaser Sheikh](http://www.cs.cmu.edu/~yaser/).
1717

1818
\* It uses Caffe, but the code is ready to be ported to other frameworks (Tensorflow, Torch, etc.). If you implement any of those, feel free to make a pull request!
1919

doc/release_notes.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,8 @@ OpenPose Library - Release Notes
9090
3. Added OpenPose 1.0.1 portable demo.
9191
4. Removed Python and some unnecessary boost dependencies on the VS project.
9292
5. Replaced all double quotes by angle brackets in include statements (issue #61).
93+
6. Added 3-D reconstruction demo.
94+
7. Auto-detection of the camera index.
9395
2. Main bugs fixed:
9496
1. Pycaffe can now be imported from Python.
9597
2. Fixed `Tutorial/Wrapper` VS linking errors.

src/openpose/utilities/flagsToOpenPose.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,9 @@ namespace op
6767
// Avoid duplicates (e.g. selecting at the time camera & video)
6868
if (!imageDirectory.empty() && !videoPath.empty())
6969
error("Selected simultaneously image directory and video. Please, select only one.", __LINE__, __FUNCTION__, __FILE__);
70-
else if (!imageDirectory.empty() && webcamIndex != 0)
70+
else if (!imageDirectory.empty() && webcamIndex > 0)
7171
error("Selected simultaneously image directory and webcam. Please, select only one.", __LINE__, __FUNCTION__, __FILE__);
72-
else if (!videoPath.empty() && webcamIndex != 0)
72+
else if (!videoPath.empty() && webcamIndex > 0)
7373
error("Selected simultaneously video and webcam. Please, select only one.", __LINE__, __FUNCTION__, __FILE__);
7474

7575
// Get desired ProducerType

0 commit comments

Comments
 (0)