Alexander Alekhin
|
238550cdad
|
ocl: code cleanup, fix .clb files
|
2013-10-11 01:19:46 +04:00 |
|
Andrey Pavlenko
|
dfbd5021fd
|
Merge pull request #1598 from alalek:ocl_fix_build_mac
|
2013-10-11 00:40:06 +04:00 |
|
Ilya Lavrenov
|
1be77dd2f3
|
enabled accuracy tests for the functions that use inside AMD Blas/Fft
|
2013-10-11 00:37:52 +04:00 |
|
Alexander Alekhin
|
0760fdcbdb
|
ocl: fix build on Mac
|
2013-10-10 23:11:48 +04:00 |
|
Ilya Lavrenov
|
1f51e6c0de
|
fixed kernel compilation warnings on MacOSX
|
2013-10-10 22:56:39 +04:00 |
|
Adrian Stratulat
|
3561bc1bbc
|
rename vBinOp64f to vBinOp64, minor fixups
|
2013-10-10 21:28:05 +03:00 |
|
Ilya Lavrenov
|
39c1e5ff73
|
added perf tests for min, max, abs
|
2013-10-10 21:54:38 +04:00 |
|
Andrey Pavlenko
|
ad1ba56fcf
|
Merge pull request #1597 from alalek:ocl_fix_cleanup
|
2013-10-10 19:02:29 +04:00 |
|
Andrey Pavlenko
|
c820777967
|
Merge pull request #1596 from alalek:test_fix_run_py
|
2013-10-10 19:02:10 +04:00 |
|
Andrey Pavlenko
|
3b1c53fa8d
|
Merge pull request #1551 from alalek:cmake_install_win
|
2013-10-10 18:20:35 +04:00 |
|
Alexander Alekhin
|
3eba2011b9
|
test: run.py: return valid errorCode in case of the single test run
|
2013-10-10 17:17:10 +04:00 |
|
Alexander Alekhin
|
6b9f74ae84
|
ocl: fix cleanup on Windows platform (for clAmdBlas/clAmdFft)
|
2013-10-10 16:58:45 +04:00 |
|
Adrian Stratulat
|
cb445d697c
|
Refactor vectorized arithmetical operations
|
2013-10-10 15:52:48 +03:00 |
|
Andrey Pavlenko
|
d5723480e1
|
Merge pull request #1592 from alalek:ocl_program_cache_update
|
2013-10-10 15:55:58 +04:00 |
|
Andrey Pavlenko
|
a351161fd7
|
Merge pull request #1591 from alalek:ocl_remove_cl_hpp_h
|
2013-10-10 15:55:13 +04:00 |
|
Ilya Lavrenov
|
9d1636daa6
|
catching OpenCL double not supported exceptions
|
2013-10-10 12:45:55 +04:00 |
|
Alexander Alekhin
|
d26f62569d
|
ocl: fix compilation warnings, update openCLExecuteKernelInterop
|
2013-10-10 00:15:02 +04:00 |
|
Alexander Alekhin
|
43c638d07d
|
ocl: remove cl.hpp dependency (it is missed on Nvidia SDK and on some platforms)
|
2013-10-09 23:53:25 +04:00 |
|
Alexander Alekhin
|
bc089bb18c
|
cmake: update java module install rules
|
2013-10-09 17:49:11 +04:00 |
|
Alexander Alekhin
|
4adede4246
|
cmake: python module updates
|
2013-10-09 17:49:11 +04:00 |
|
Alexander Alekhin
|
555c505b70
|
update cmake 'install' target for Windows platform
Allow to build samples via OpenCV binaries from distribution package
(find_package with OpenCV_DIR).
|
2013-10-09 17:49:10 +04:00 |
|
Ilya Lavrenov
|
fccd37de7e
|
changes eps for NORM_L1
|
2013-10-09 14:18:07 +04:00 |
|
Ilya Lavrenov
|
488e6aafaf
|
fixed the PR 1582
|
2013-10-09 14:16:36 +04:00 |
|
Andrey Pavlenko
|
6b69a66c3c
|
Merge pull request #1579 from ilya-lavrenov:ocl_norm
|
2013-10-09 13:52:20 +04:00 |
|
Andrey Pavlenko
|
ff8e5a04a4
|
Merge pull request #1586 from ilya-lavrenov:ocl_setto_win_fix
|
2013-10-09 13:49:34 +04:00 |
|
Roman Donchenko
|
3d4ec7ad98
|
Merge pull request #1583 from SpecLad:name-enum-2
|
2013-10-09 13:45:40 +04:00 |
|
Roman Donchenko
|
dfb698dc64
|
Merge pull request #1581 from SpecLad:merge-2.4
|
2013-10-09 12:33:50 +04:00 |
|
Alexander Alekhin
|
076eeffd4d
|
ocl: fix CL_RUNTIME_EXPORT for master branch
|
2013-10-08 19:13:58 +04:00 |
|
Ilya Lavrenov
|
245ff93544
|
ocl setto fix for windows
|
2013-10-08 19:11:32 +04:00 |
|
Ilya Lavrenov
|
bdd5038da4
|
ocl setto fix for windows
|
2013-10-08 18:52:32 +04:00 |
|
Sebastian Krmer
|
3696174b14
|
fix documentation warning
|
2013-10-08 16:49:20 +02:00 |
|
Ilya Lavrenov
|
c404da784f
|
fixed ocl::norm (previously the function used double as a work type)
|
2013-10-08 18:43:49 +04:00 |
|
Roman Donchenko
|
cc7a13ea57
|
Named GraphCutSeamFinderBase to allow its usage in makePtr.
Sequel to bcb6f038 .
|
2013-10-08 18:13:56 +04:00 |
|
Roman Donchenko
|
f07769e9d8
|
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
cmake/OpenCVDetectOpenCL.cmake
cmake/OpenCVModule.cmake
modules/imgproc/src/floodfill.cpp
modules/nonfree/src/surf.ocl.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/include/opencv2/ocl/private/util.hpp
modules/ocl/perf/main.cpp
modules/ocl/src/arithm.cpp
modules/ocl/src/blend.cpp
modules/ocl/src/build_warps.cpp
modules/ocl/src/canny.cpp
modules/ocl/src/cl_programcache.hpp
modules/ocl/src/columnsum.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/hog.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/initialization.cpp
modules/ocl/src/match_template.cpp
modules/ocl/src/matrix_operations.cpp
modules/ocl/src/mcwutil.cpp
modules/ocl/src/moments.cpp
modules/ocl/src/mssegmentation.cpp
modules/ocl/src/precomp.hpp
modules/ocl/src/pyrdown.cpp
modules/ocl/src/pyrlk.cpp
modules/ocl/src/pyrup.cpp
modules/ocl/src/split_merge.cpp
modules/ocl/src/stereo_csbp.cpp
modules/ocl/src/stereobm.cpp
modules/ocl/test/main.cpp
samples/ocl/bgfg_segm.cpp
samples/ocl/facedetect.cpp
samples/ocl/pyrlk_optical_flow.cpp
samples/ocl/squares.cpp
samples/ocl/stereo_match.cpp
samples/ocl/surf_matcher.cpp
samples/ocl/tvl1_optical_flow.cpp
|
2013-10-08 17:57:23 +04:00 |
|
Sebastian Krämer
|
4ffd3fb905
|
add ocl::abs
|
2013-10-08 15:23:24 +02:00 |
|
Sebastian Krämer
|
c844bbdd82
|
documentation update for ocl::min and ocl::max
|
2013-10-08 15:23:18 +02:00 |
|
Sebastian Krämer
|
33df7131ae
|
add ocl::min and ocl::max (includes accuracy tests update)
|
2013-10-08 15:23:13 +02:00 |
|
Vladislav Vinogradov
|
342e007dc6
|
now Allocator accepts GpuMat* instead of 3 pointers
|
2013-10-08 17:21:25 +04:00 |
|
Vladislav Vinogradov
|
3b412b51ac
|
moved BufferPool management functions to public
|
2013-10-08 17:21:22 +04:00 |
|
Vladislav Vinogradov
|
5ea8085220
|
added BufferPool class
|
2013-10-08 17:20:29 +04:00 |
|
Vladislav Vinogradov
|
988ab79acb
|
added BufferAllocator
|
2013-10-08 17:20:20 +04:00 |
|
Roman Donchenko
|
ae851af648
|
Merge pull request #1574 from alalek:svm_workaround
|
2013-10-08 15:31:42 +04:00 |
|
Roman Donchenko
|
65ec9f77d9
|
Merge pull request #1577 from ilya-lavrenov:ocl_setto_opencl12
|
2013-10-08 15:15:31 +04:00 |
|
Roman Donchenko
|
bc3669bfb1
|
Merge pull request #1576 from alalek:ocl_fix_cl_double
|
2013-10-08 14:20:11 +04:00 |
|
Roman Donchenko
|
685eceb68a
|
Merge pull request #1567 from ilya-lavrenov:warn_fix
|
2013-10-08 13:50:49 +04:00 |
|
Roman Donchenko
|
895308a811
|
Merge pull request #1538 from StevenPuttemans:bugfix_3283
|
2013-10-08 13:00:39 +04:00 |
|
Roman Donchenko
|
ec409a436d
|
Merge pull request #1545 from alalek:ocl_test_fix_rng
|
2013-10-08 12:59:50 +04:00 |
|
Ilya Lavrenov
|
32f11e6f40
|
enabled OpenCL 1.2 branch in oclMat::setTo
|
2013-10-08 12:49:29 +04:00 |
|
Ilya Lavrenov
|
35d9ce0c0c
|
fixed warnings
|
2013-10-08 12:46:43 +04:00 |
|
Roman Donchenko
|
95b3a344d9
|
Merge pull request #1570 from ilya-lavrenov:ipp_warn_fix
|
2013-10-08 12:32:57 +04:00 |
|
Alexander Alekhin
|
1d6327ba2a
|
ocl: fix Context::CL_* usage
|
2013-10-08 12:23:46 +04:00 |
|
Alexander Alekhin
|
f63b0dfaf4
|
svm: disable failed tests
|
2013-10-07 18:17:10 +04:00 |
|
Roman Donchenko
|
b08233a3ca
|
Merge pull request #1569 from ilya-lavrenov:ocl_hough_circles
|
2013-10-07 17:47:41 +04:00 |
|
Roman Donchenko
|
920e15b41d
|
Merge pull request #1572 from emchristiansen:includeLimits
|
2013-10-07 16:59:24 +04:00 |
|
Roman Donchenko
|
f91f8663b6
|
Merge pull request #1568 from ilya-lavrenov:ocl_pyrlk
|
2013-10-07 15:53:20 +04:00 |
|
Roman Donchenko
|
801054d611
|
Merge pull request #1566 from SpecLad:Wshadow-openni
|
2013-10-07 15:48:40 +04:00 |
|
Vladislav Vinogradov
|
e5188c7e94
|
added GpuMat::Allocator interface
|
2013-10-07 09:42:43 +04:00 |
|
Greg Hale
|
88b1847d09
|
add include limits, for compilers that dont add it implicitly
|
2013-10-06 01:21:43 -04:00 |
|
Eric Martin Christiansen
|
c8a3a85e26
|
adds include to fix build
|
2013-10-05 15:52:19 -07:00 |
|
Ilya Lavrenov
|
036e99d03a
|
fixed ipp-related warnings
|
2013-10-05 14:54:00 +04:00 |
|
Ilya Lavrenov
|
8c82decf5b
|
added plain branch to HoughCircle perf test
|
2013-10-04 19:51:26 +04:00 |
|
Roman Donchenko
|
46eeb106e2
|
Merge pull request #1564 from alalek:cl_runtime_fix_32bit
|
2013-10-04 18:29:04 +04:00 |
|
Roman Donchenko
|
0a13510293
|
Merge pull request #1557 from ilya-lavrenov:ocl_minor_doc_update
|
2013-10-04 18:25:44 +04:00 |
|
Ilya Lavrenov
|
72c35d3a89
|
fixed mog2
|
2013-10-04 18:19:01 +04:00 |
|
Roman Donchenko
|
744f4b1609
|
Merge pull request #1565 from SpecLad:cmake-new-ptr
|
2013-10-04 18:14:34 +04:00 |
|
Roman Donchenko
|
2660f4bc59
|
Merge pull request #1562 from ilya-lavrenov:ocl_integral
|
2013-10-04 18:12:43 +04:00 |
|
Ilya Lavrenov
|
fb73e7b4bd
|
fixed pyrlk optical flow
|
2013-10-04 17:56:02 +04:00 |
|
Roman Donchenko
|
aa80250a3d
|
Merge pull request #1532 from alalek:stereo_csbp
|
2013-10-04 16:43:51 +04:00 |
|
Roman Donchenko
|
cca2e5d8b1
|
Merge pull request #1536 from asmorkalov:android_ndk_r9_master
|
2013-10-04 16:36:44 +04:00 |
|
Roman Donchenko
|
1b51270617
|
Merge pull request #1558 from SpecLad:Wparentheses-equality
|
2013-10-04 16:32:09 +04:00 |
|
Roman Donchenko
|
f04cade607
|
Merge pull request #1559 from SpecLad:Wnull-conversion
|
2013-10-04 16:08:54 +04:00 |
|
Alexander Alekhin
|
de0f310e81
|
ocl: tests: RNG usage refactoring
|
2013-10-04 15:39:39 +04:00 |
|
Roman Donchenko
|
3cfad385ec
|
Fix a -Wshadow warning in cap_openni.cpp.
|
2013-10-04 14:23:06 +04:00 |
|
Roman Donchenko
|
ca65fe4548
|
Merge pull request #1535 from asmorkalov:android_ndk_r9
|
2013-10-04 14:14:20 +04:00 |
|
Roman Donchenko
|
b03c19a8ac
|
Merge pull request #1554 from pablospe:fix_viz_module_compilation
|
2013-10-04 14:02:17 +04:00 |
|
Roman Donchenko
|
32630dbf61
|
Adapt cap_openni.cpp to the new Ptr.
|
2013-10-04 13:51:58 +04:00 |
|
StevenPuttemans
|
2f474db27f
|
Fix of bug #3283 and bug #3301
Added extra information for fitEllipse, minAreaRect and addapted ellipse &
ellipse2Poly parameter description.
|
2013-10-04 11:19:45 +02:00 |
|
Alexander Alekhin
|
90df620deb
|
ocl: stereo_csbp: divUp -> roundUp
|
2013-10-04 12:48:26 +04:00 |
|
Alexander Alekhin
|
2d1a6687f9
|
autogenerated code
|
2013-10-04 12:40:08 +04:00 |
|
Alexander Alekhin
|
2fdfa37ea5
|
ocl: runtime, fix 32-bit builds
|
2013-10-04 12:40:08 +04:00 |
|
Ilya Lavrenov
|
10d60f99dc
|
fixed ocl::integral and enabled perf test for it
|
2013-10-04 12:33:14 +04:00 |
|
Ilya Lavrenov
|
5f81988699
|
refactored arithm binary operations in order to make them more scalable
|
2013-10-04 12:13:22 +04:00 |
|
Alexander Alekhin
|
d74ca7b39d
|
ocl: update module documentation
|
2013-10-03 23:26:06 +04:00 |
|
Alexander Alekhin
|
7f0680fc8b
|
ocl: workaround for OpenCL C++ bindings usage: CL/cl.hpp
|
2013-10-03 23:26:06 +04:00 |
|
Alexander Alekhin
|
8beb514ecf
|
ocl: merge with upstream/2.4
|
2013-10-03 23:26:06 +04:00 |
|
Alexander Alekhin
|
16adbda4d3
|
ocl: added OpenCL device selection via OPENCV_OPENCL_DEVICE environment variable
|
2013-10-03 19:50:14 +04:00 |
|
Alexander Alekhin
|
dd9ff587dc
|
ocl: file-based ProgramCache refactoring
|
2013-10-03 19:50:14 +04:00 |
|
Alexander Alekhin
|
b00f79ac5f
|
ocl: move program names into opencl_kernels.hpp
|
2013-10-03 19:50:14 +04:00 |
|
Alexander Alekhin
|
e8d9ed8955
|
ocl: split initialization.cpp into 3 files: context, operations, programcache
|
2013-10-03 19:50:14 +04:00 |
|
Ilya Lavrenov
|
dafd4da031
|
removed ocl::minMax_buf, updated doc (operation on matrices)
|
2013-10-03 18:19:15 +04:00 |
|
Roman Donchenko
|
1817a07a5e
|
Fixed a -Wnull-conversion Clang warning in cap_gstreamer.cpp.
|
2013-10-03 12:11:50 +04:00 |
|
Roman Donchenko
|
fa9d092c43
|
Fix a -Wparentheses-equality Clang warning in cap_libv4l.cpp.
|
2013-10-03 12:04:57 +04:00 |
|
Roman Donchenko
|
a1e239d2bf
|
Merge pull request #1527 from vpisarev:shape_module
|
2013-10-03 11:54:41 +04:00 |
|
Alexander Smorkalov
|
1aaeb52a4c
|
Android NDK r9 support. x64 NDK support fix for MacOS X.
|
2013-10-03 11:36:12 +04:00 |
|
Alexander Smorkalov
|
ccb48ddee0
|
Android NDK r9 support. x64 NDK support fix for MacOS X.
|
2013-10-03 11:23:50 +04:00 |
|
Ilya Lavrenov
|
adca219f18
|
fixed convertC3C4 and convertC4C3 functions in case cols == 1
|
2013-10-03 10:45:15 +04:00 |
|
Pablo Speciale
|
f47afe5799
|
Fixed VIZ compilation module (Bug 3297: code.opencv.org/issues/3297)
|
2013-10-03 02:10:27 +02:00 |
|
Andrey Pavlenko
|
88419f8923
|
Merge pull request #1507 from pengx17:2.4_fix_test
|
2013-10-02 19:52:12 +04:00 |
|
Andrey Pavlenko
|
73744904a2
|
Merge pull request #1542 from alalek:cl_runtime
|
2013-10-02 19:50:35 +04:00 |
|
Alexander Alekhin
|
12eb340a4e
|
removed invalid comment
|
2013-10-02 19:35:21 +04:00 |
|