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
moodoki
cebf109d39
Replaced code in .rst file with literalinclude as suggested
2013-11-15 00:27:07 +08: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
moodoki
b8de81749c
Slight modification to example code for FLANN matcher with comment on #3344
2013-11-14 00:22:20 +08: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
Ilya Lavrenov
0bf7350615
fixed compilation of ocl::minMaxLoc for Intel device
2013-11-12 19:14:40 +04:00
huangs
f02ce90559
minX1 should be max(-maxD,0) not max(maxD,0), avoid black band at left
2013-11-12 22:37:23 +08:00
Roman Donchenko
b8e3d3f791
In the image sequence capture, only search for the ordinal in the file name.
...
Searching in directory names can yield confusing results; e.g. if
the input is "jpeg2000/image1.jp2", it will infer the pattern
"jpeg%04d/image1.jp2", which is likely not what the user intended.
If the user really desires for the variable part to be in the
directory name, it can always use an explicit pattern.
2013-11-12 16:26:21 +04:00
Ilya Lavrenov
96121a66c5
kernel warnings on AMD
2013-11-12 15:06:46 +04:00
Roman Donchenko
a81efdbb25
Merge pull request #1775 from ilya-lavrenov:ocl_cvtColor
2013-11-12 14:26:50 +04:00
perping
d6e0ef2710
fix linux warning.
2013-11-12 18:13:44 +08:00
perping
dee584ee15
fix haar
2013-11-12 17:54:03 +08:00
Roman Donchenko
834705490e
Merge pull request #1782 from ilya-lavrenov:ocl_adapBilat
2013-11-12 12:53:34 +04:00
Roman Donchenko
ef4eadd5d3
Merge pull request #1766 from ilya-lavrenov:ocl_remap_linear
2013-11-12 12:40:14 +04:00
Roman Donchenko
46e423d217
Merge pull request #1773 from ilya-lavrenov:ocl_buildWarpPerspectiveMaps
2013-11-12 12:26:37 +04:00
Roman Donchenko
6773914144
Merge pull request #1783 from SpecLad:cap-no-pattern
2013-11-12 11:52:50 +04:00
perping
8af626d295
fix some bug about haar and match_template.
2013-11-12 13:56:47 +08:00
Ilya Lavrenov
eda6360fa3
added RGB5x5 <-> Gray
2013-11-12 00:32:10 +04:00
Philippe FOUBERT
93120775cd
Using four spaces for indentation.
2013-11-11 20:40:18 +01:00
Roman Donchenko
f461930d07
Merge pull request #1781 from SpecLad:merge-2.4
2013-11-11 19:15:25 +04:00
