StevenPuttemans
2b106db02f
Applied all fixes related to translating C to C++ code
...
Also fixed some typos and code alignment
Also adapted tutorial CPP samples
Fixed some identation problems
2013-11-17 20:34:50 +01:00
Anatoly Baksheev
9e3a29701e
Viz code beautification
2013-11-17 19:33:55 +04:00
Anatoly Baksheev
efcc341219
added viz tutorial 3 test
2013-11-17 15:18:15 +04:00
Anatoly Baksheev
e154bce259
fixed compilation for vs2008
2013-11-17 14:13:13 +04:00
Anatoly Baksheev
d8600d3d13
fixed all Viz warnings
...
moved some headers to precomp.hpp
2013-11-17 14:13:11 +04:00
Anatoly Baksheev
5c6248005a
fixed warnings
2013-11-17 14:08:57 +04:00
Anatoly Baksheev
dfef42f94e
Fixed Viz compilation: removed CV_EXPORTS from cv::viz::Color. The macro forced instantiation of all Matx<double, 4, 1> constructors and triggered StaticAssert there.
2013-11-17 14:08:56 +04:00
Anatoly Baksheev
0dad070473
Fixed compilation errors: removed using namespace from hpp file. This led to pulling cv::ACCESS_MASK to global namespace where conflict with the same name in 'windows.h'
2013-11-17 14:08:56 +04:00
Anatoly Baksheev
d275e29ea4
compilation & warnings
2013-11-17 14:08:55 +04:00
Anatoly Baksheev
13bb236ad5
fixed some warnings
2013-11-16 21:18:36 +04:00
Anatoly Baksheev
8f6f9c3e58
compilation for VS2008
2013-11-16 20:14:01 +04:00
Alexander Alekhin
0a698bf145
ocl: fix cvtColor XYZ: variables on stack
2013-11-16 13:45:39 +04:00
Ilya Lavrenov
cc237b7aba
generalized ocl::resize for all data types (INTER_NEAREST mode)
2013-11-15 22:52:29 +04:00
Roman Donchenko
615d6c22d1
Switched OpenCV to a 3-component version number.
...
Epoch is gone; now the version component names in C++ and CMake
are consistent (except REVISION corresponds to PATCH).
2013-11-15 19:41:53 +04:00
Roman Donchenko
f95ff0a352
Merge pull request #1802 from SpecLad:cmake-templates
2013-11-15 16:52:56 +04:00
Roman Donchenko
4e2ec7b97d
Merge pull request #1803 from ilya-lavrenov:ocl_cvtColor
2013-11-15 15:55:29 +04:00
Roman Donchenko
b8c46f4cce
Merge pull request #1804 from alekcac:youtube_link_fix
2013-11-15 15:53:05 +04:00
Roman Donchenko
bb0d88cf6f
Merge pull request #1801 from vrabaud:master
2013-11-15 12:01:16 +04:00
Roman Donchenko
2e79dde357
Merge pull request #1799 from SpecLad:avformat-53-6
2013-11-15 11:51:59 +04:00
Alexander Shishkov
4c9a6bd4ec
Update widget_pose.rst
...
changed Youtube link to our channel
2013-11-15 04:36:22 +03:00
Roman Donchenko
428fb72625
Made the generated file templates' naming more consistent.
...
The general convention is <output file name> + ".in".
2013-11-14 19:14:38 +04:00
Vincent Rabaud
154d119e13
do not use include_directories when calling find_package(OpenCV)
...
This is something that should be left to the user, that's the whole
point of OpenCV_INCLUDE_DIRS.
2013-11-14 15:24:18 +01:00
Roman Donchenko
3b7acf2657
Fix building with FFmpeg 0.8.
...
avformat_find_stream_info was introduced in Libav avformat 53.3,
but it was only merged to FFmpeg in avformat 53.6.
In Libav avformat 53.3-53.5 av_find_stream_info is not removed
(only deprecated), so this shouldn't break building with that.
2013-11-14 17:25:46 +04:00
Roman Donchenko
01f8645bc8
Merge pull request #1794 from vrabaud:2.4
2013-11-14 16:43:50 +04:00
Roman Donchenko
be88b20154
Merge pull request #1796 from ilya-lavrenov:ocl_cvtColor
2013-11-14 14:46:43 +04:00
Roman Donchenko
84da6ca265
Merge pull request #1792 from ilya-lavrenov:ocl_warp_eps
2013-11-14 14:46:06 +04:00
Roman Donchenko
19b3064706
Merge pull request #1790 from ilya-lavrenov:ocl_ref
2013-11-14 14:45:50 +04:00
Vincent Rabaud
8e944cfe70
cleaner fix
2013-11-14 11:45:42 +01:00
Ilya Lavrenov
fe76b2116a
added RGBA <-> mRGBA
2013-11-14 12:02:59 +04:00
Ilya Lavrenov
1b7c5b201d
added HLS -> RGB[A][FULL] conversion
2013-11-13 19:35:24 +04:00
Ilya Lavrenov
98915e06bc
added HSV -> RGB[A][FULL] conversion
2013-11-13 19:10:06 +04:00
Ilya Lavrenov
3bdd9626f3
added RGB[A] -> HLS[FULL] conversion
2013-11-13 17:41:40 +04:00
Roman Donchenko
15f4292a1f
Merge pull request #1788 from alalek:perf_test_skip
2013-11-13 17:21:52 +04:00
Vincent Rabaud
ee7c74ceeb
return when OpenCV is found
2013-11-13 14:20:09 +01:00
Ilya Lavrenov
af7c614438
added RGB[A] -> HSV[FULL] conversion
2013-11-13 17:09:05 +04:00
Roman Donchenko
411629a57d
Merge pull request #1786 from SpecLad:cap-images-file-pattern
2013-11-13 17:00:20 +04:00
Roman Donchenko
54ea5bbac7
Merge pull request #1779 from perping:integral_2.4
2013-11-13 15:53:42 +04:00
Roman Donchenko
28e0d3d771
Merge pull request #1784 from SpecLad:ffmpeg-no-png
2013-11-13 15:52:42 +04:00
Vincent Rabaud
9007a02302
fixes http://code.opencv.org/issues/3367
2013-11-13 12:25:44 +01:00
Alexander Alekhin
fb326a58fc
ocl: perf tests: skip tests if we fail check for maxMemoryAllocSize
2013-11-13 14:17:57 +04:00
Alexander Alekhin
f1873bbca1
perf tests: allow to skip performance tests
2013-11-13 14:17:56 +04:00
Ilya Lavrenov
6770c04073
refactored some functions from ocl arithm
2013-11-13 13:56:49 +04:00
Ilya Lavrenov
c38e4f9639
added eps to ocl::buildWarpPerspectiveMaps perf test
2013-11-13 13:04:02 +04:00
Roman Donchenko
376993be4c
Merge pull request #1785 from ilya-lavrenov:ocl_kern_warn
2013-11-13 12:20:09 +04:00
Roman Donchenko
df6bce372b
Merge pull request #1789 from ilya-lavrenov:ocl_minMaxLoc
2013-11-13 12:16:02 +04:00
Roman Donchenko
a8e1d1f0b2
Merge pull request #1791 from prattmic:limit
2013-11-13 12:15:18 +04:00
Michael Pratt
73f1940b03
Add missing limits include
...
Without limits included, several CUDA related files fail to compile with
GCC on Ubuntu:
modules/cudaimgproc/src/hough_lines.cpp:136:9: error: ‘numeric_limits’ is not a member of ‘std’
2013-11-12 22:29:41 -05:00
perping
185059959b
fix haar
2013-11-13 10:19:09 +08:00
perping
1e2fb6de30
fix match_template and haar
2013-11-13 10:09:39 +08:00
Roman Donchenko
3314bc94b6
Reworked documentation building to work with extra modules.
...
The main problem with extra modules is that they're located outside
of the OpenCV root, while Sphinx requires that all documents are
within the documentation root. To circumvent this, we create a
"fake root" and copy all documentation (as well as all files that
it depends on) there. It's a bit messy, but what can you do.
As a bonus, this eliminates the need to generate modules/refman.rst
inside the source tree.
2013-11-12 19:38:59 +04:00
