Roman Donchenko
599d51ec14
Merge pull request #1651 from ilya-lavrenov:misprint
2013-10-21 14:00:23 +04:00
peng xiao
7285341083
1. Let btvRegWeights to be constant per process
call.
...
2. Let Farneback to be the default optical flow method.
3. Fix a timing method bug for ocl path.
4. Remove useless finish operation in farneback
5. Refactor buffer usage.
2013-10-21 10:21:37 +08:00
Jose-Luis Blanco-Claraco
52a904e17b
Fixed MSVC 2013 build errors and workaround for an internal compiler crash.
2013-10-20 17:28:45 +02:00
Nghia Ho
2238e711b5
Copied errorCovPre to errorCovPost. This allows the correct behaviour of the uncertainty to grow when there is missing data for each predict step.
2013-10-20 13:00:11 +11:00
Greg Hale
fe3dd762a4
fixed wrong regex
2013-10-19 17:30:32 -04:00
Ilya Lavrenov
4f68f35a78
added reflect, reflect101, replicate, wrap border types to ocl::remap
2013-10-19 23:38:50 +04:00
Ilya Lavrenov
bebc1c9330
misprint
2013-10-19 22:59:47 +04:00
Vladislav Vinogradov
5673e7e435
fix bug in gpu bgsegm sample
...
create `d_fgimg` matrix before cleaning.
2013-10-19 12:40:10 +04:00
Kevin
8f995fac88
Change intrinsic camera matrix initialization
...
In the function cvInitIntrinsicParams2D the principal point for
normalized image coordinates is set to 0/0. This updates the function
to initialize the principal point at 0.5/0.5.
2013-10-19 02:10:20 -05:00
Ilya Lavrenov
e9cef2990e
made more demonstrative message about test fails
2013-10-19 01:17:46 +04:00
Alexander Alekhin
cfc3b9abbb
ocl: workaround for msvc11 bug
...
"#error" requires DOS line endings (or fails with fatal error C1004: unexpected end-of-file found)
See: http://connect.microsoft.com/VisualStudio/feedback/details/794991/c-error-directive-and-unix-line-endings-leads-to-an-unexpected-end-of-file
So replace them to #pragma message.
2013-10-18 20:52:36 +04:00
Andrey Pavlenko
d50f0d2ed2
Merge pull request #1587 from alalek:opencl_khronos_headers
2013-10-18 18:41:13 +04:00
Roman Donchenko
83b36dcbcf
Merge pull request #1459 from asmorkalov:ocv_qt_segflt_fix
2013-10-18 18:39:08 +04:00
Roman Donchenko
d700cc60be
Merge pull request #1641 from jet47:imshow-opengl-fix
2013-10-18 18:23:00 +04:00
Roman Donchenko
df279150ae
Merge pull request #1642 from alalek:cmake_cleanup_targets
2013-10-18 18:19:36 +04:00
Ilya Lavrenov
022b5d6c74
refactored ocl matrix operations accuracy tests
2013-10-18 17:36:38 +04:00
Ilya Lavrenov
b3e1a4598c
enabled double in copyMakeBorder kernel
2013-10-18 16:46:51 +04:00
Ilya Lavrenov
2681cef5d7
rewrote ocl::remap
2013-10-18 16:41:09 +04:00
Ilya Lavrenov
3fe74ad124
fixed ocl::copyMakeBorder
2013-10-18 16:39:47 +04:00
Ilya Lavrenov
36342eb425
added ROI support to ocl::convolve
2013-10-18 16:36:11 +04:00
Ilya Lavrenov
110a92c126
added ROI support to ocl::columnSum
2013-10-18 16:33:48 +04:00
Ilya Lavrenov
60f9ba0c64
added ROI support to ocl::CLAHE
2013-10-18 16:31:52 +04:00
Ilya Lavrenov
4a81be7d0b
refactored all the tests in ocl/test/test_imgproc.cpp
2013-10-18 16:29:10 +04:00
Alexander Alekhin
fd4e705b14
ocl: update autogenerated code
2013-10-18 15:47:11 +04:00
Alexander Alekhin
6344da9ac3
ocl: force to use Khronos OpenCL headers
2013-10-18 15:47:11 +04:00
Alexander Alekhin
9d380ecc08
added Khronos OpenCL 1.2 header files
2013-10-18 15:44:55 +04:00
Andrey Pavlenko
4cbf0cb31e
Merge pull request #1640 from alalek:ocl_fix_exp_test
2013-10-18 13:45:12 +04:00
Andrey Pavlenko
97dfd65007
Merge pull request #1626 from ilya-lavrenov:ocl_filters
2013-10-18 13:44:41 +04:00
Roman Donchenko
5e24376ad7
Updated ffmpeg_vesion.cmake after #1516 .
2013-10-18 12:23:56 +04:00
Alexander Alekhin
83b7fbe376
cmake: cleanup OpenCVModules_TARGETS from cache
...
This will allow to disable modules between cmake runs
2013-10-17 23:43:33 +04:00
Greg Hale
0c4d484679
added backslash
2013-10-17 14:17:49 -04:00
Greg Hale
61ccd170bd
shortened code to not repeat myself
2013-10-17 14:12:02 -04:00
Greg Hale
5bd5993663
Only append -l to lib entries with no path and no -l or -L of their own
2013-10-17 14:05:06 -04:00
Vladislav Vinogradov
fa70f95272
fix imshow under Windows with OpenGL support:
...
we doesn't create OpenGL windows by default
OpenGL window must be created by user via namedWindow
2013-10-17 20:58:33 +04:00
Alexander Alekhin
4bfeeb0738
ocl: perf: use RELATIVE_ERROR in SANITY_CHECK for exp/log/pow
2013-10-17 19:00:36 +04:00
Roman Donchenko
578e984739
OpenCV 2.4.6.2 (Tegra detection and native camera update)
...
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
iF4EABEIAAYFAlIxuvoACgkQdDiF7KIeJGrdaQEA0cMV6JhnsWSnZbRCd3RzyXD7
8mf7qrSjIV9ty1UL9AMA/0d4iUIm/iEiBIEP0DbsshX+trN5kXsH5woriScbZMGS
=WeoS
-----END PGP SIGNATURE-----
Merge tag '2.4.6.2' into 2.4
OpenCV 2.4.6.2 (Tegra detection and native camera update)
2013-10-17 17:19:04 +04:00
Roman Donchenko
fb7b4d2d60
Merge pull request #1636 from ilya-lavrenov:ocl_loop_times
2013-10-17 17:00:45 +04:00
Roman Donchenko
88cc054f10
Merge pull request #1369 from StevenPuttemans:fix_featuretracker
2013-10-17 15:42:38 +04:00
Roman Donchenko
9c7ba848bb
Merge pull request #1516 from akarsakov:new_ffmpeg_build
2013-10-17 15:41:18 +04:00
Ilya Lavrenov
07aee1a25c
made LOOP_TIMES as a command line option with default value=1
2013-10-17 12:40:16 +04:00
Alexander Karsakov
cee308312a
Updated build of ffmpeg library (v 2.0.2). Builded with mingw (gcc 4.6.1) with
...
folowing additional options: --enable-w32threads, --arch=i686 (for 32-bit
library, workaround for http://trac.ffmpeg.org/ticket/2363 )
2013-10-17 12:29:00 +04:00
Roman Donchenko
d411041c53
Merge pull request #1637 from SpecLad:run-py-java-fix
2013-10-17 12:25:31 +04:00
Ilya Lavrenov
da3b7c79b8
refactored filters in the ocl module; added an accuracy tests for ocl::medianFilter
2013-10-17 12:23:56 +04:00
Andrey Pavlenko
7605426dc3
Merge pull request #1613 from alalek:ocl_cvtcolor
2013-10-17 12:07:20 +04:00
Andrey Pavlenko
8b63e33b24
Merge pull request #1632 from alalek:cmake_find_package_build_dir
2013-10-17 11:59:27 +04:00
Andrey Pavlenko
e14dc887c6
Merge pull request #1635 from alalek:cmake_fix_export_java
2013-10-17 11:55:25 +04:00
Andrey Pavlenko
28ecd54f58
Merge pull request #1634 from alalek:cmake_fix_cuda_linker_deps
2013-10-17 11:55:03 +04:00
Alexander Alekhin
ce0647c9b6
ocl: rewrite CvtColor tests, added roi support
2013-10-16 22:46:21 +04:00
Roman Donchenko
5bb6949bd6
Fix running Java tests with run.py on everything other than Windows.
...
Previously, run.py would assume that the opencv_java library is in the
same directory as the tests, which is only true on Windows.
The library path depends on the build configuration, which may not be
known until the actual build (e.g. with the Visual Studio generators),
so it can't be stored in the CMake cache for run.py to read. I didn't
want to hardcode into run.py where the library is on each platform,
either. So that's why I used the current scheme with the properties
file. It also makes running the tests without run.py a little easier.
2013-10-16 19:22:01 +04:00
Alexander Alekhin
09f0e1777e
cmake: fix linker deps for CUDA
2013-10-16 18:34:47 +04:00