From a9d4e0534651ab8690bdaf3e5ae69d8cd3fe0afd Mon Sep 17 00:00:00 2001 From: "Prof. Dr. Rudolf Haussmann" Date: Wed, 25 Mar 2015 15:45:20 +0100 Subject: [PATCH] Changes to be committed: (use "git reset HEAD ..." to unstage) modified: highgui/include/opencv2/highgui/highgui_c.h modified: highgui/src/cap_dshow.cpp modified: java/generator/gen_java.py The correction of the orthographic error in the enumeration constant CAP_PROP_MONOCROME has been undone. --- modules/highgui/include/opencv2/highgui/highgui_c.h | 2 +- modules/highgui/src/cap_dshow.cpp | 6 +++--- modules/java/generator/gen_java.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/highgui/include/opencv2/highgui/highgui_c.h b/modules/highgui/include/opencv2/highgui/highgui_c.h index a061df6..85a59bb 100644 --- a/modules/highgui/include/opencv2/highgui/highgui_c.h +++ b/modules/highgui/include/opencv2/highgui/highgui_c.h @@ -365,7 +365,7 @@ enum CV_CAP_PROP_CONVERT_RGB =16, CV_CAP_PROP_WHITE_BALANCE_U =17, CV_CAP_PROP_RECTIFICATION =18, - CV_CAP_PROP_MONOCHROME =19, + CV_CAP_PROP_MONOCROME =19, CV_CAP_PROP_SHARPNESS =20, CV_CAP_PROP_AUTO_EXPOSURE =21, // exposure control done by camera, // user can adjust refernce level diff --git a/modules/highgui/src/cap_dshow.cpp b/modules/highgui/src/cap_dshow.cpp index 5d99786..78026b8 100644 --- a/modules/highgui/src/cap_dshow.cpp +++ b/modules/highgui/src/cap_dshow.cpp @@ -2246,7 +2246,7 @@ int videoInput::getVideoPropertyFromCV(int cv_property){ case CV_CAP_PROP_GAMMA: return VideoProcAmp_Gamma; - case CV_CAP_PROP_MONOCHROME: + case CV_CAP_PROP_MONOCROME: return VideoProcAmp_ColorEnable; case CV_CAP_PROP_WHITE_BALANCE_U: @@ -3245,7 +3245,7 @@ double CvCaptureCAM_DShow::getProperty( int property_id ) case CV_CAP_PROP_SATURATION: case CV_CAP_PROP_SHARPNESS: case CV_CAP_PROP_GAMMA: - case CV_CAP_PROP_MONOCHROME: + case CV_CAP_PROP_MONOCROME: case CV_CAP_PROP_WHITE_BALANCE_U: case CV_CAP_PROP_BACKLIGHT: case CV_CAP_PROP_GAIN: @@ -3349,7 +3349,7 @@ bool CvCaptureCAM_DShow::setProperty( int property_id, double value ) case CV_CAP_PROP_SATURATION: case CV_CAP_PROP_SHARPNESS: case CV_CAP_PROP_GAMMA: - case CV_CAP_PROP_MONOCHROME: + case CV_CAP_PROP_MONOCROME: case CV_CAP_PROP_WHITE_BALANCE_U: case CV_CAP_PROP_BACKLIGHT: case CV_CAP_PROP_GAIN: diff --git a/modules/java/generator/gen_java.py b/modules/java/generator/gen_java.py index b025dbd..fce172f 100755 --- a/modules/java/generator/gen_java.py +++ b/modules/java/generator/gen_java.py @@ -73,7 +73,7 @@ const_ignore_list = ( "CV_CAP_PROP_CONVERT_RGB", "CV_CAP_PROP_WHITE_BALANCE_U", "CV_CAP_PROP_RECTIFICATION", - "CV_CAP_PROP_MONOCHROME", + "CV_CAP_PROP_MONOCROME", "CV_CAP_PROP_SHARPNESS", "CV_CAP_PROP_AUTO_EXPOSURE", "CV_CAP_PROP_GAMMA", -- 2.7.4