Roman Donchenko
|
eb86d37b26
|
Removed some dubious FFmpeg hack that no longer works.
|
11 years ago |
Roman Donchenko
|
66beb44286
|
Applied a change from 555c505b to 3rdparty/tbb/CMakeLists.txt.
Odd that it wasn't merged automatically...
|
11 years ago |
Roman Donchenko
|
779acfa715
|
Suppressed -Wundef in bioinspired, because of OpenCL headers.
|
11 years ago |
Roman Donchenko
|
4036f6a3d0
|
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
apps/CMakeLists.txt
modules/contrib/CMakeLists.txt
modules/core/include/opencv2/core/version.hpp
modules/imgproc/include/opencv2/imgproc/imgproc.hpp
modules/java/generator/gen_java.py
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/cl_runtime/cl_runtime.cpp
modules/ocl/src/columnsum.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/test/main.cpp
modules/ocl/test/test_color.cpp
modules/ocl/test/test_imgproc.cpp
samples/gpu/CMakeLists.txt
|
11 years ago |
Roman Donchenko
|
a54d36bde8
|
Merge pull request #1646 from alalek:ocl_fix_msvc11
|
11 years ago |
Roman Donchenko
|
29f37fc130
|
Merge pull request #1575 from jet47:gpu-buffer-pool
|
11 years ago |
Roman Donchenko
|
21233656bd
|
Merge pull request #1540 from jet47:gpuarithm-cudev
|
11 years ago |
Roman Donchenko
|
e290436a4c
|
Merge pull request #1492 from jet47:gpucodec-cudev
|
11 years ago |
Roman Donchenko
|
f25b77ff1e
|
Merge pull request #1534 from jet47:fix-cuda-5.0-build
|
11 years ago |
Roman Donchenko
|
bfd8acbbc3
|
Merge pull request #1556 from jet47:fix-bug-3296
|
11 years ago |
Roman Donchenko
|
9bc347c848
|
Merge pull request #1650 from jet47:fix-gpu-bgsegm-sample
|
11 years ago |
Andrey Pavlenko
|
aec7d9c1db
|
Merge pull request #1647 from ilya-lavrenov:ocl_tests_demonstrative
|
11 years ago |
Andrey Pavlenko
|
0ad04d66e3
|
Merge pull request #1645 from ilya-lavrenov:ocl_morph_test_fix
|
11 years ago |
Andrey Pavlenko
|
e82fd12a67
|
Merge pull request #1644 from ilya-lavrenov:ocl_matrix_operations
|
11 years ago |
Andrey Pavlenko
|
bd1a1cc031
|
Merge pull request #1633 from ilya-lavrenov:ocl_imgproc
|
11 years ago |
Ilya Lavrenov
|
9d923b50ac
|
fixed ocl::Laplacian for case when scale != 1
|
11 years ago |
Ilya Lavrenov
|
6085c416a7
|
missed initialization of kernel size
|
11 years ago |
Roman Donchenko
|
599d51ec14
|
Merge pull request #1651 from ilya-lavrenov:misprint
|
11 years ago |
Ilya Lavrenov
|
4f68f35a78
|
added reflect, reflect101, replicate, wrap border types to ocl::remap
|
11 years ago |
Ilya Lavrenov
|
bebc1c9330
|
misprint
|
11 years ago |
Vladislav Vinogradov
|
5673e7e435
|
fix bug in gpu bgsegm sample
create `d_fgimg` matrix before cleaning.
|
11 years ago |
Ilya Lavrenov
|
e9cef2990e
|
made more demonstrative message about test fails
|
11 years ago |
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.
|
11 years ago |
Andrey Pavlenko
|
d50f0d2ed2
|
Merge pull request #1587 from alalek:opencl_khronos_headers
|
11 years ago |
Roman Donchenko
|
83b36dcbcf
|
Merge pull request #1459 from asmorkalov:ocv_qt_segflt_fix
|
11 years ago |
Roman Donchenko
|
d700cc60be
|
Merge pull request #1641 from jet47:imshow-opengl-fix
|
11 years ago |
Roman Donchenko
|
df279150ae
|
Merge pull request #1642 from alalek:cmake_cleanup_targets
|
11 years ago |
Ilya Lavrenov
|
022b5d6c74
|
refactored ocl matrix operations accuracy tests
|
11 years ago |
Ilya Lavrenov
|
b3e1a4598c
|
enabled double in copyMakeBorder kernel
|
11 years ago |
Ilya Lavrenov
|
2681cef5d7
|
rewrote ocl::remap
|
11 years ago |
Ilya Lavrenov
|
3fe74ad124
|
fixed ocl::copyMakeBorder
|
11 years ago |
Ilya Lavrenov
|
36342eb425
|
added ROI support to ocl::convolve
|
11 years ago |
Ilya Lavrenov
|
110a92c126
|
added ROI support to ocl::columnSum
|
11 years ago |
Ilya Lavrenov
|
60f9ba0c64
|
added ROI support to ocl::CLAHE
|
11 years ago |
Ilya Lavrenov
|
4a81be7d0b
|
refactored all the tests in ocl/test/test_imgproc.cpp
|
11 years ago |
Alexander Alekhin
|
fd4e705b14
|
ocl: update autogenerated code
|
11 years ago |
Alexander Alekhin
|
6344da9ac3
|
ocl: force to use Khronos OpenCL headers
|
11 years ago |
Alexander Alekhin
|
9d380ecc08
|
added Khronos OpenCL 1.2 header files
|
11 years ago |
Andrey Pavlenko
|
4cbf0cb31e
|
Merge pull request #1640 from alalek:ocl_fix_exp_test
|
11 years ago |
Andrey Pavlenko
|
97dfd65007
|
Merge pull request #1626 from ilya-lavrenov:ocl_filters
|
11 years ago |
Roman Donchenko
|
5e24376ad7
|
Updated ffmpeg_vesion.cmake after #1516.
|
11 years ago |
Alexander Alekhin
|
83b7fbe376
|
cmake: cleanup OpenCVModules_TARGETS from cache
This will allow to disable modules between cmake runs
|
11 years ago |
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
|
11 years ago |
Alexander Alekhin
|
4bfeeb0738
|
ocl: perf: use RELATIVE_ERROR in SANITY_CHECK for exp/log/pow
|
11 years ago |
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)
|
11 years ago |
Roman Donchenko
|
fb7b4d2d60
|
Merge pull request #1636 from ilya-lavrenov:ocl_loop_times
|
11 years ago |
Roman Donchenko
|
88cc054f10
|
Merge pull request #1369 from StevenPuttemans:fix_featuretracker
|
11 years ago |
Roman Donchenko
|
9c7ba848bb
|
Merge pull request #1516 from akarsakov:new_ffmpeg_build
|
11 years ago |
Ilya Lavrenov
|
07aee1a25c
|
made LOOP_TIMES as a command line option with default value=1
|
11 years ago |
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)
|
11 years ago |