generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added Qt help generation support

Browse Source
This commit is contained in:
Maksim Shabunin 2014-12-26 18:39:40 +03:00
parent 3ffae9f7b7
commit 11591b3e9d
5 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
doc/CMakeLists.txt
View File

@ -129,6 +129,11 @@ if(BUILD_DOCS AND DOXYGEN_FOUND)
set(CMAKE_DOXYGEN_MAIN_REFERENCE "${refs_main}") set(CMAKE_DOXYGEN_MAIN_REFERENCE "${refs_main}")
set(CMAKE_DOXYGEN_EXTRA_REFERENCE "${refs_extra}") set(CMAKE_DOXYGEN_EXTRA_REFERENCE "${refs_extra}")
set(CMAKE_EXTRA_BIB_FILES "${bibfile} ${paths_bib}") set(CMAKE_EXTRA_BIB_FILES "${bibfile} ${paths_bib}")
if (CMAKE_DOXYGEN_GENERATE_QHP)
set(CMAKE_DOXYGEN_GENERATE_QHP "YES")
else()
set(CMAKE_DOXYGEN_GENERATE_QHP "NO")
endif()
list(APPEND CMAKE_DOXYGEN_HTML_FILES "${CMAKE_CURRENT_SOURCE_DIR}/opencv.ico") list(APPEND CMAKE_DOXYGEN_HTML_FILES "${CMAKE_CURRENT_SOURCE_DIR}/opencv.ico")
list(APPEND CMAKE_DOXYGEN_HTML_FILES "${CMAKE_CURRENT_SOURCE_DIR}/pattern.png") list(APPEND CMAKE_DOXYGEN_HTML_FILES "${CMAKE_CURRENT_SOURCE_DIR}/pattern.png")

8
doc/Doxyfile.in
View File

@ -148,10 +148,10 @@ GENERATE_CHI = NO
CHM_INDEX_ENCODING = CHM_INDEX_ENCODING =
BINARY_TOC = NO BINARY_TOC = NO
TOC_EXPAND = NO TOC_EXPAND = NO
GENERATE_QHP = NO GENERATE_QHP = @CMAKE_DOXYGEN_GENERATE_QHP@
QCH_FILE = QCH_FILE = ../opencv-@OPENCV_VERSION@.qch
QHP_NAMESPACE = org.doxygen.Project QHP_NAMESPACE = org.itseez.opencv.@OPENCV_VERSION@
QHP_VIRTUAL_FOLDER = doc QHP_VIRTUAL_FOLDER = opencv
QHP_CUST_FILTER_NAME = QHP_CUST_FILTER_NAME =
QHP_CUST_FILTER_ATTRS = QHP_CUST_FILTER_ATTRS =
QHP_SECT_FILTER_ATTRS = QHP_SECT_FILTER_ATTRS =

4
modules/cudaimgproc/include/opencv2/cudaimgproc.hpp
View File

@ -89,7 +89,7 @@ performance.
*/ */
CV_EXPORTS void cvtColor(InputArray src, OutputArray dst, int code, int dcn = 0, Stream& stream = Stream::Null()); CV_EXPORTS void cvtColor(InputArray src, OutputArray dst, int code, int dcn = 0, Stream& stream = Stream::Null());
enum enum DemosaicTypes
{ {
//! Bayer Demosaicing (Malvar, He, and Cutler) //! Bayer Demosaicing (Malvar, He, and Cutler)
COLOR_BayerBG2BGR_MHT = 256, COLOR_BayerBG2BGR_MHT = 256,
@ -156,7 +156,7 @@ CV_EXPORTS void swapChannels(InputOutputArray image, const int dstOrder[4], Stre
*/ */
CV_EXPORTS void gammaCorrection(InputArray src, OutputArray dst, bool forward = true, Stream& stream = Stream::Null()); CV_EXPORTS void gammaCorrection(InputArray src, OutputArray dst, bool forward = true, Stream& stream = Stream::Null());
enum { ALPHA_OVER, ALPHA_IN, ALPHA_OUT, ALPHA_ATOP, ALPHA_XOR, ALPHA_PLUS, ALPHA_OVER_PREMUL, ALPHA_IN_PREMUL, ALPHA_OUT_PREMUL, enum AlphaCompTypes { ALPHA_OVER, ALPHA_IN, ALPHA_OUT, ALPHA_ATOP, ALPHA_XOR, ALPHA_PLUS, ALPHA_OVER_PREMUL, ALPHA_IN_PREMUL, ALPHA_OUT_PREMUL,
ALPHA_ATOP_PREMUL, ALPHA_XOR_PREMUL, ALPHA_PLUS_PREMUL, ALPHA_PREMUL}; ALPHA_ATOP_PREMUL, ALPHA_XOR_PREMUL, ALPHA_PLUS_PREMUL, ALPHA_PREMUL};
/** @brief Composites two images using alpha opacity values contained in each image. /** @brief Composites two images using alpha opacity values contained in each image.

6
modules/imgproc/include/opencv2/imgproc.hpp
View File

@ -271,7 +271,8 @@ enum InterpolationFlags{
WARP_INVERSE_MAP = 16 WARP_INVERSE_MAP = 16
}; };
enum { INTER_BITS = 5, enum InterpolationMasks {
INTER_BITS = 5,
INTER_BITS2 = INTER_BITS * 2, INTER_BITS2 = INTER_BITS * 2,
INTER_TAB_SIZE = 1 << INTER_BITS, INTER_TAB_SIZE = 1 << INTER_BITS,
INTER_TAB_SIZE2 = INTER_TAB_SIZE * INTER_TAB_SIZE INTER_TAB_SIZE2 = INTER_TAB_SIZE * INTER_TAB_SIZE
@ -329,7 +330,8 @@ enum AdaptiveThresholdTypes {
}; };
//! cv::undistort mode //! cv::undistort mode
enum { PROJ_SPHERICAL_ORTHO = 0, enum UndistortTypes {
PROJ_SPHERICAL_ORTHO = 0,
PROJ_SPHERICAL_EQRECT = 1 PROJ_SPHERICAL_EQRECT = 1
}; };

2
modules/photo/include/opencv2/photo/photo_c.h
View File

@ -54,7 +54,7 @@ extern "C" {
*/ */
/* Inpainting algorithms */ /* Inpainting algorithms */
enum enum InpaintingModes
{ {
CV_INPAINT_NS =0, CV_INPAINT_NS =0,
CV_INPAINT_TELEA =1 CV_INPAINT_TELEA =1