Prof. Dr. Rudolf Haussmann 9f1eb70dbc Changes to be committed: ... (use "git reset HEAD <file>..." to unstage) modified: modules/java/generator/gen_java.py modified: modules/videoio/include/opencv2/videoio.hpp modified: modules/videoio/include/opencv2/videoio/videoio_c.h modified: modules/videoio/src/cap_dshow.cpp modified: modules/videoio/src/cap_pvapi.cpp Following changes have been made: 1. Some minor bugs have been removed. 2. In the PvAPI module the option CAP_PROP_MONOCROME has been removed because this option does not make sense and causes an error if a color camera is used. 3. Instead the new option CAP_PROP_PVAPI_PIXELFORMAT has been added which allows to activate the different pixel formats (color modes) of an AVT camera. 4. Since there were two identical defines CAP_PROP_MONOCROME = 19 CAP_PROP_MONOCHROME = 19 which were also used in the other module DSHOW, the first one with an orthographic error has been removed in favor of the second one.		2015-03-07 12:53:32 +01:00
..
android_lib	Switched OpenCV to a 3-component version number.	2013-11-15 19:41:53 +04:00
android_test	Modified java wrapping mechanism	2015-03-02 18:12:30 +03:00
common_test	Modified java wrapping mechanism	2015-03-02 18:12:30 +03:00
generator	Changes to be committed:	2015-03-07 12:53:32 +01:00
pure_test	Modified java wrapping mechanism	2015-03-02 18:12:30 +03:00
build.xml.in	Fix for encoding errors when building Java source	2013-03-27 17:43:00 +04:00
check-tests.py	Normalized file endings.	2013-08-21 18:59:25 +04:00
CMakeLists.txt	Python support	2015-03-02 18:13:00 +03:00