Skip to content

Commit f0624c0

Browse files
author
Vadim Pisarevsky
committed
propagated some more changes from 2.3 to trunk
1 parent 6e613bc commit f0624c0

File tree

116 files changed

+22046
-6606
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

116 files changed

+22046
-6606
lines changed

‎OpenCVInstallRequiredSystemLibraries.cmake‎

Lines changed: 0 additions & 235 deletions
This file was deleted.

‎Package.cmake.in‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ endif()
1010
#if(ENABLE_OPENMP)
1111
# set(CMAKE_INSTALL_OPENMP_LIBRARIES 1)
1212
#endif()
13-
#include(OpenCVInstallRequiredSystemLibraries.cmake)
1413
include(InstallRequiredSystemLibraries)
1514

1615
set(CPACK_PACKAGE_NAME "OpenCV")
@@ -77,7 +76,7 @@ set(CPACK_SOURCE_PACKAGE_FILE_NAME
7776
if(WIN32)
7877
set(CPACK_GENERATOR "NSIS")
7978
set(CPACK_SOURCE_GENERATOR "ZIP")
80-
set(CPACK_NSIS_PACKAGE_NAME "OpenCV ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
79+
set(CPACK_NSIS_PACKAGE_NAME "OpenCV ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}rc")
8180
set(CPACK_NSIS_MUI_ICON "${CMAKE_SOURCE_DIR}\\\\doc\\\\opencv.ico")
8281
set(CPACK_NSIS_MUI_UNIICON "${CMAKE_SOURCE_DIR}\\\\doc\\\\opencv.ico")
8382
#set(CPACK_PACKAGE_ICON "utils/opencv.ico")
@@ -90,7 +89,9 @@ if(WIN32)
9089

9190
set(CPACK_NSIS_MENU_LINKS
9291
"http://opencv.willowgarage.com" "Start Page"
93-
"doc\\\\opencv.pdf" "The Reference Manual"
92+
"doc\\\\opencv2refman_cpp.pdf" "The OpenCV C++ Reference Manual"
93+
"doc\\\\opencv2refman_py.pdf" "The OpenCV Python Reference Manual"
94+
"doc\\\\opencv_tutorials.pdf" "The OpenCV Tutorials for Beginners"
9495
"CMakeLists.txt" "The Build Script (open with CMake)"
9596
"samples\\\\c" "C Samples"
9697
"samples\\\\cpp" "C++ Samples"

‎doc/CMakeLists.txt‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,13 @@ project(opencv_docs)
1313

1414
file(GLOB_RECURSE OPENCV2_FILES_PICT ../modules/*.png ../modules/*.jpg)
1515
file(GLOB_RECURSE OPENCV2_FILES_RST ../modules/*.rst)
16+
file(GLOB_RECURSE OPENCV2_PY_FILES_RST opencv2/*.rst)
1617
file(GLOB_RECURSE OPENCV1_FILES_PICT pics/*.png pics/*.jpg)
1718
file(GLOB_RECURSE OPENCV1_FILES_RST opencv1/*.rst)
1819
file(GLOB_RECURSE OPENCV_FILES_UG user_guide/*.rst)
1920
file(GLOB_RECURSE OPENCV_FILES_TUT tutorials/*.rst)
2021

21-
set(OPENCV_DOC_DEPS conf.py ${OPENCV2_FILES_RST} ${OPENCV2_FILES_PICT}
22+
set(OPENCV_DOC_DEPS conf.py ${OPENCV2_FILES_RST} ${OPENCV2_FILES_PICT} ${OPENCV2_PY_FILES_RST}
2223
${OPENCV1_FILES_RST} ${OPENCV1_FILES_PICT}
2324
${OPENCV_FILES_UG} ${OPENCV_FILES_TUT})
2425

@@ -30,8 +31,10 @@ add_custom_target(docs
3031
${CMAKE_CURRENT_SOURCE_DIR}/pics ${CMAKE_CURRENT_BINARY_DIR}/doc/opencv1/pics
3132
COMMAND ${CMAKE_COMMAND} -E copy
3233
${CMAKE_CURRENT_SOURCE_DIR}/mymath.sty ${CMAKE_CURRENT_BINARY_DIR}
33-
COMMAND ${PDFLATEX_COMPILER} opencv2refman
34-
COMMAND ${PDFLATEX_COMPILER} opencv2refman
34+
COMMAND ${PDFLATEX_COMPILER} opencv2refman_cpp
35+
COMMAND ${PDFLATEX_COMPILER} opencv2refman_cpp
36+
COMMAND ${PDFLATEX_COMPILER} opencv2refman_py
37+
COMMAND ${PDFLATEX_COMPILER} opencv2refman_py
3538
COMMAND ${PDFLATEX_COMPILER} opencv1refman_c
3639
COMMAND ${PDFLATEX_COMPILER} opencv1refman_c
3740
COMMAND ${PDFLATEX_COMPILER} opencv1refman_py

‎doc/README.txt‎

Lines changed: 0 additions & 54 deletions
This file was deleted.

‎doc/_themes/blue/static/default.css_t‎

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -274,17 +274,30 @@ tt.descname {
274274
font-size: 1.6em;
275275
}
276276

277-
dl.cfunction {
278-
padding-bottom: 9px;
277+
div.math p {
278+
margin-top: 10px;
279+
margin-bottom: 10px;
280+
}
281+
282+
dl.function > dt:first-child {
283+
margin-bottom: 7px;
284+
background-color: #ecf0f3;
279285
}
280286

281287
dl.cfunction > dt:first-child {
282288
margin-bottom: 7px;
283-
border-bottom: 1px dotted black;
289+
background-color: #ecf0f3;
290+
}
291+
292+
dl.pyfunction > dt:first-child {
293+
margin-bottom: 7px;
294+
background-color: #ecf0f3;
284295
}
285296

286-
div.math p {
287-
margin-top: 10px;
288-
margin-bottom: 10px;
297+
table.field-list {
298+
margin-top: 20px;
289299
}
290300

301+
ul.simple {
302+
list-style: none;
303+
}

‎doc/acircles_pattern.png‎

-269 KB
Loading

0 commit comments

Comments
 (0)