generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
9,908 Commits 3 Branches 47 Tags 422 MiB
C++ 83.4%
Cuda 5.9%
C 3.8%
Java 2.4%
CMake 2.2%
Other 2.1%
38bb0db9db
Go to file
Samuel Martin 38bb0db9db cmake: fix gstreamer check conditions 
The current situation of the Gstreamer detection does not always honor
all the configurations set by the user, among this:
- if both WITH_GSTREAMER and WITH_GSTREAMER_0_10 are off, but
  Gstreamer 0.10 is installed in the system, Gstreamer 0.10 support will
  be enable;
- if both WITH_GSTREAMER and WITH_GSTREAMER_0_10 are on, only checks for
  Gstreamer 0.10 will be run.

This patch fixes the Gstreamer detection like this:

  |        -DWITH_...          | Package installed  ||    OpenCV    |
  | GSTREAMER | GSTREAMER_0_10 | gst-1.x | gst-0.10 || gst. support |
  +===========+================+=========+==========##==============+
  |    OFF    |      OFF       |    -    |    -     ||     none     |
  |    OFF    |      ON        |    -    |    no    ||     none     |
  |    OFF    |      ON        |    -    |   yes    ||   gst-0.10   |
  |    ON     |      OFF       |    no   |    no    ||     none     |
  |    ON     |      OFF       |    no   |   yes    ||   gst-0.10   |
  |    ON     |      OFF       |   yes   |    -     ||    gst-1.x   |
  |    ON     |      ON        |   yes   |    -     ||    gst-1.x   |

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
2014-10-06 21:40:55 +02:00
3rdparty Android native camera rebuilt after sources update. 2014-07-30 14:52:01 +04:00
apps Check sure that we're not already below required leaf false alarm rate before continuing to get negative samples. 2014-09-18 16:54:22 +04:00
cmake cmake: fix gstreamer check conditions 2014-10-06 21:40:55 +02:00
data fixed two models, adding xml identifier to correct position 2014-07-01 10:27:36 +02:00
doc OpenCV Manager version++. 2014-09-30 12:05:46 +04:00
include All installed files marked with component names for install customization. 2014-01-21 20:34:36 +04:00
modules doc/check_docs2.py warnings fixes 2014-10-02 13:40:30 +04:00
platforms Merge pull request #3285 from asmorkalov:android_servive_big.little_fix 2014-09-30 15:19:07 +00:00
samples Merge pull request #2965 from soulslicer:patch-2 2014-07-15 09:44:32 +00:00
.gitattributes Added more text/binary/whitespace attributes for files we have. 2013-08-21 18:59:24 +04:00
.gitignore updated .gitignore 2014-01-10 18:59:06 +04:00
.tgitconfig Add tgit.icon project config 2014-02-26 17:46:52 +08:00
CMakeLists.txt GStreamer 1.0 backport from master branch. 2014-09-30 12:30:09 +04:00
index.rst android -> plarforms/android 2013-05-27 11:10:38 +04:00
LICENSE Initial Linux packages build rools for CPack. 2014-01-21 20:34:36 +04:00
README.md Replaced Gittip button 2014-02-15 13:10:09 +04:00

README.md

OpenCV: Open Source Computer Vision Library

Gittip

Resources

Contributing

Please read before starting work on a pull request: http://code.opencv.org/projects/opencv/wiki/How_to_contribute

Summary of guidelines:

  • One pull request per issue;
  • Choose the right base branch;
  • Include tests and documentation;
  • Clean up "oops" commits before submitting;
  • Follow the coding style guide.