Andrey Pavlenko
|
8176e893c0
|
Merge pull request #2609 from alalek:tests_fixes
|
2014-04-14 18:54:01 +04:00 |
|
Andrey Pavlenko
|
5ff59af09d
|
Merge pull request #2610 from ilya-lavrenov:ipp_cvtcolor
|
2014-04-14 18:52:07 +04:00 |
|
Andrey Pavlenko
|
f4c5679db8
|
Merge pull request #2614 from ilya-lavrenov:ipp_laplacian
|
2014-04-14 18:51:31 +04:00 |
|
Roman Donchenko
|
799d2dabd6
|
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
modules/core/test/test_arithm.cpp
modules/cuda/src/cascadeclassifier.cpp
modules/imgproc/doc/geometric_transformations.rst
modules/objdetect/src/hog.cpp
modules/ocl/perf/perf_imgproc.cpp
modules/ocl/src/gftt.cpp
modules/ocl/src/moments.cpp
|
2014-04-14 16:08:02 +04:00 |
|
Ilya Lavrenov
|
884b706b3a
|
fixed warning
|
2014-04-14 14:40:40 +04:00 |
|
Ilya Lavrenov
|
ad7f2311c0
|
cv::Laplacian
|
2014-04-14 14:34:28 +04:00 |
|
Ilya Lavrenov
|
2a051a124f
|
cvtColor
|
2014-04-14 14:29:36 +04:00 |
|
Andrey Pavlenko
|
5522c14efc
|
Merge pull request #2607 from ilya-lavrenov:warn_sup
|
2014-04-14 14:15:12 +04:00 |
|
krodyush
|
57992e0169
|
replace IPatchLocal[][] into *IPatchLocal to fix compilation error on some devices.
|
2014-04-14 13:23:12 +04:00 |
|
unknown
|
d2b4ee1e9b
|
More intendation fixes
|
2014-04-11 21:44:12 -07:00 |
|
unknown
|
06df383675
|
Indent fixes
|
2014-04-11 19:14:01 -07:00 |
|
Alexander Alekhin
|
3a1a3da782
|
fix tests
|
2014-04-11 16:11:05 +04:00 |
|
Andrey Pavlenko
|
f104d5be8c
|
Merge pull request #2600 from ilya-lavrenov:ipp_calc_hist
|
2014-04-11 15:18:04 +04:00 |
|
Andrey Pavlenko
|
fd90efc9dd
|
Merge pull request #2593 from arkunze:pullreq/140319-color
|
2014-04-11 15:16:33 +04:00 |
|
Alexander Alekhin
|
047d285b7d
|
ICV: added package downloader
|
2014-04-11 14:19:18 +04:00 |
|
Roman Donchenko
|
df8e28283f
|
Merge pull request #2571 from MartinChodakowski:fix-old-python-doc-typos
|
2014-04-11 14:15:26 +04:00 |
|
Roman Donchenko
|
4c2db3d6e7
|
Merge pull request #2579 from maksqwe:test_operations_fix
|
2014-04-11 14:14:33 +04:00 |
|
Roman Donchenko
|
8ab224746b
|
Merge pull request #2603 from maksqwe:unused_fix_2.4
|
2014-04-11 14:14:04 +04:00 |
|
Ilya Lavrenov
|
19d470749b
|
added macro for denoting region for suppression of "Wdeprecated-declarations"
|
2014-04-11 13:45:20 +04:00 |
|
Andrey Pavlenko
|
925178749a
|
removing SuppressWarning and CV_OPENCL_RUN
|
2014-04-11 13:09:19 +04:00 |
|
Alexander Alekhin
|
3578f0afe9
|
ocl: workaround for synchronization issue in ::map()
|
2014-04-11 13:09:18 +04:00 |
|
Alexander Alekhin
|
588658d1a3
|
tapi: stitching: fix documentation
|
2014-04-11 13:09:17 +04:00 |
|
Alexander Alekhin
|
026b13b3db
|
TAPI: stitching: blender: fix OpenCL path & adjust test condition
|
2014-04-11 13:09:16 +04:00 |
|
Alexander Alekhin
|
e6cc1be7e8
|
stitching: allow to use dynamic DescriptorMatcher
|
2014-04-11 13:01:13 +04:00 |
|
Alexander Alekhin
|
06738468af
|
TAPI: stiching: add custom OpenCL kernels for MultiBandBlender
|
2014-04-11 13:01:12 +04:00 |
|
Alexander Alekhin
|
c22d92c1cb
|
stitching: extend logging
|
2014-04-11 13:01:11 +04:00 |
|
Alexander Alekhin
|
a7f69a37e3
|
stitching: use BORDER_CONSTANT in warp
|
2014-04-11 13:01:10 +04:00 |
|
Alexander Alekhin
|
c4a31a1ab1
|
TAPI: stitching: optimize compare operation
|
2014-04-11 13:01:10 +04:00 |
|
Alexander Alekhin
|
7a5c1babde
|
TAPI: stitching: optimize exposure
|
2014-04-11 13:01:09 +04:00 |
|
Alexander Alekhin
|
2737e3c99b
|
TAPI: stitching: workaround for problem getUMat() call
|
2014-04-11 13:01:08 +04:00 |
|
Alexander Alekhin
|
c1ea6f3c42
|
TAPI: stitching: improve warpers
|
2014-04-11 13:01:07 +04:00 |
|
Alexander Alekhin
|
89e3e448f5
|
features2d: workaround for 'utrainDescCollection' issue (PR #2142)
|
2014-04-11 13:01:07 +04:00 |
|
Alexander Alekhin
|
1d9808e5d5
|
TAPI: stitching, replaced Mat->UMat/_Array
|
2014-04-11 13:01:06 +04:00 |
|
Alexander Alekhin
|
8b6c5ade0e
|
TAPI: added perf test for stitching
|
2014-04-11 13:01:05 +04:00 |
|
Andrey Pavlenko
|
6bfbcf02cb
|
Merge pull request #2587 from ElenaGvozdeva:ipp_matchTemplate
|
2014-04-11 12:47:25 +04:00 |
|
Andrey Pavlenko
|
f7f4593936
|
Merge pull request #2581 from vbystricky:ipp_moments
|
2014-04-11 12:45:13 +04:00 |
|
Andrey Pavlenko
|
7ae547a208
|
Merge pull request #2597 from ilya-lavrenov:ipp_countnonzero
|
2014-04-11 12:43:24 +04:00 |
|
Andrey Pavlenko
|
b56dce3965
|
Merge pull request #2604 from alalek:binary_package_fix
|
2014-04-11 12:34:23 +04:00 |
|
unknown
|
e032b5f5d5
|
Resolving conflicts after rebasing from public
|
2014-04-10 12:28:37 -07:00 |
|
Aaron Kunze
|
b59c517f98
|
Optimizations to OpenCL bilateral filter.
|
2014-04-10 12:15:13 -07:00 |
|
Ilya Lavrenov
|
b970ec7dae
|
parallel version
|
2014-04-10 19:39:00 +04:00 |
|
Elena Gvozdeva
|
43c29a6751
|
fixed
|
2014-04-10 17:26:38 +04:00 |
|
Vadim Pisarevsky
|
f417c79d16
|
Merge pull request #1932 from seth-planet:master
|
2014-04-10 13:36:14 +04:00 |
|
Vadim Pisarevsky
|
604a64b206
|
Merge pull request #2390 from nicolasmartin3d:master_bug3546
|
2014-04-10 13:33:43 +04:00 |
|
Vadim Pisarevsky
|
a0bf7f82ba
|
Merge pull request #2067 from pemmanuelviel:groupWiseCenterChooser
|
2014-04-10 13:33:29 +04:00 |
|
Vadim Pisarevsky
|
dae04aacc3
|
Merge pull request #2575 from rold2007:Bugfix_1437
|
2014-04-10 13:31:33 +04:00 |
|
Vadim Pisarevsky
|
b66adc81a4
|
Merge pull request #2599 from maksqwe:test_calibration_2.4
|
2014-04-10 13:30:37 +04:00 |
|
Vadim Pisarevsky
|
b5755b1228
|
Merge pull request #2588 from vpisarev:fix_samples_n_unused
|
2014-04-10 13:30:20 +04:00 |
|
Vadim Pisarevsky
|
211d44cfc5
|
Merge pull request #2591 from Nerei:viz_cloud_shading_support
|
2014-04-10 13:29:58 +04:00 |
|
Ilya Lavrenov
|
b2379b51b5
|
cv::countNonZero
|
2014-04-10 13:21:52 +04:00 |
|