alexandre benoit
188f889949
Merge branch 'master' of code.opencv.org:opencv
2013-07-04 16:19:24 +02:00
Andrey Pavlenko
70deda354a
Merge pull request #1047 from jet47:gpustream-remove-obsolete
2013-07-02 18:39:12 +04:00
Andrey Pavlenko
89086bdb8d
Merge pull request #1046 from SpecLad:merge-2.4
2013-07-02 15:39:07 +04:00
Roman Donchenko
4f19216e45
Merge pull request #1036 from jet47:fix-gpu-deviceinfo
2013-06-27 15:37:42 +04:00
Roman Donchenko
c1f8d9e3d2
Merge pull request #1011 from wecacuee:master
2013-06-27 12:03:07 +04:00
Vikas Dhiman
f15dc72b89
Removed misleading comment and added the divisibility test to ::run function.
2013-06-26 12:16:25 -04:00
Roman Donchenko
53afdb4b30
Merge pull request #1041 from abidrahmank:master
2013-06-26 16:38:54 +04:00
Vladislav Vinogradov
3c32fc1329
removed obsolete methods from gpu::Stream
2013-06-25 17:45:23 +04:00
Roman Donchenko
f36f8067bc
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/calib3d/include/opencv2/calib3d/calib3d.hpp
modules/core/include/opencv2/core/core.hpp
modules/core/include/opencv2/core/cuda/limits.hpp
modules/core/include/opencv2/core/internal.hpp
modules/core/src/matrix.cpp
modules/nonfree/test/test_features2d.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/hog.cpp
modules/ocl/test/test_haar.cpp
modules/ocl/test/test_objdetect.cpp
modules/ocl/test/test_pyrup.cpp
modules/ts/src/precomp.hpp
samples/ocl/facedetect.cpp
samples/ocl/hog.cpp
samples/ocl/pyrlk_optical_flow.cpp
samples/ocl/surf_matcher.cpp
2013-06-25 15:55:52 +04:00
Roman Donchenko
1dccf5743e
Merge pull request #1024 from jet47:fix-gpuarithm-compilation
2013-06-25 14:38:18 +04:00
abidrahmank
a1ea1a7ec5
boxpoints documentation
2013-06-24 16:17:23 +05:30
abidrahmank
bcf9117957
Added missing python functions in highgui documentation
...
setMouseCallback
createTrackbar
2013-06-24 15:53:45 +05:30
Roman Donchenko
3bab7391d0
Merge pull request #1028 from SpecLad:ocl-clahe-dtor
2013-06-24 13:18:28 +04:00
Roman Donchenko
171a56fe82
Merge pull request #1034 from pengx17:2.4_oclmat_inoutarray
2013-06-24 12:27:26 +04:00
Roman Donchenko
7cb047e2d9
Merge pull request #1031 from pengx17:2.4_fix_converTo
2013-06-24 12:25:48 +04:00
Roman Donchenko
4ed3d33dd7
Merge pull request #1025 from bitwangyaoyao:2.4_tests
2013-06-24 12:11:04 +04:00
Roman Donchenko
b0421cafab
Merge pull request #1022 from bitwangyaoyao:2.4_hog
2013-06-24 12:08:59 +04:00
abidrahmank
37f4e400e4
Added cv2.boxPoints() functionality to Python bindings (Feature #2023 )
...
http://www.code.opencv.org/issues/2023
eg:
In [3]: box = ((10,10),(5,5),0)
In [4]: cv2.boxPoints(box)
Out[4]:
array([[ 7.5, 12.5],
[ 7.5, 7.5],
[ 12.5, 7.5],
[ 12.5, 12.5]], dtype=float32)
2013-06-24 12:13:59 +05:30
Vladislav Vinogradov
98bd401534
fix gpu::DeviceInfo compilation under linux
...
glibc defines major and minor macros
which conflict with gpu::DeviceInfo methods with the same name
2013-06-24 10:11:44 +04:00
Roman Donchenko
5fa200763f
Merge pull request #1026 from SpecLad:ts-version-prop
2013-06-21 18:00:59 +04:00
Roman Donchenko
eff6dccb3b
Merge pull request #1014 from jet47:gpustereo-refactoring
2013-06-21 17:38:36 +04:00
Roman Donchenko
b20c9ad2d1
Merge pull request #1015 from SpecLad:merge-2.4
2013-06-21 17:38:04 +04:00
Roman Donchenko
e3ae36dcb3
Merge pull request #1033 from SpecLad:xls++
2013-06-21 17:13:33 +04:00
Roman Donchenko
84639e444b
Merge pull request #1010 from jet47:gpufilters-refactoring
2013-06-21 14:45:50 +04:00
peng xiao
290c8db0a8
Revise naming for getOclMat function.
2013-06-21 14:51:23 +08:00
yao
6326739b44
a bug fix in stereo_match sample
2013-06-21 14:50:08 +08:00
peng xiao
e129638263
Add a workaround to interpolate between oclMat and Input/OutputArray.
2013-06-21 14:05:29 +08:00
Roman Donchenko
57317c3196
Use log formatting as intended.
2013-06-20 19:39:02 +04:00
Roman Donchenko
3e2c456313
A few minor improvements to the XLS report generator.
...
* In comparison column headers, switched the order of labels, so that
it's "to" vs "from".
* When a test was present, but not run successfully, put its status in
the corresponding cell instead of coloring it gray.
2013-06-20 14:38:01 +04:00
Roman Donchenko
13323882d4
Merge pull request #1027 from jet47:fix-cuda-4.2-build
2013-06-20 14:11:52 +04:00
Roman Donchenko
e600beb484
Merge pull request #1017 from jet47:fix-gpu-warnings
2013-06-20 12:13:14 +04:00
Vladislav Vinogradov
f08d75a84b
removed obsolete API
2013-06-20 11:24:29 +04:00
peng xiao
c1f4fe1637
Fix a bug of convertTo.
...
The bug was found that all 3-channel oclMat's were converted to
4-channel oclMat's after using convertTo function.
2013-06-20 11:26:22 +08:00
Roman Donchenko
1d9660c6d2
Merge pull request #954 from LeszekSwirski:24_fix-qtwindow
2013-06-19 17:01:57 +04:00
Roman Donchenko
1ed5fb937d
Give cv::ocl::CLAHE a virtual destructor, for the usual reasons.
2013-06-19 15:39:11 +04:00
Vladislav Vinogradov
50166d2734
fixed compilation with CUDA 4.2
2013-06-19 15:29:20 +04:00
Roman Donchenko
13cd0a0502
Merge remote-tracking branch 'origin/2.4'
...
Original pull requests:
#996 from jet47:gpu-nvcuvid-libraries
#995 from jet47:fix-bug-2985
#999 from snosov1:unreliable-results-fix
#1005 from alekcac:doc_fix
#1004 from jet47:fix-bug-3068
#987 from jet47:bug-3085-fix
#969 from pengx17:2.4_binary_cache
#929 from dominikrose:mingw-libdc1394-2-windows
#1000 from ivan-korolev:fix_sift_bug_2892
#1001 from ivan-korolev:fix_stitching_bug_2405
#998 from asmorkalov:android_cmake_mips_fix
#993 from ivan-korolev:fix_videostab_bug_3023
#988 from snosov1:3071-fix
#986 from pengx17:2.4_initiated_context
#982 from pengx17:2.4_fix_two_bugs
#981 from SeninAndrew:ximea_camera_support_fix
#991 from asmorkalov:android_javadoc_fix
#972 from jet47:mog2-params-bug-2168
#980 from SpecLad:include-config
#973 from pengx17:2.4_oclclahe
#903 from aks2:2.4
#968 from asmorkalov:android_na_cproj_fix
#971 from SpecLad:matchers-ctor
#970 from asmorkalov:dshow_valid_check_fix
#965 from apavlenko:fix_java_empty_mats
Conflicts:
cmake/OpenCVModule.cmake
modules/core/src/matmul.cpp
modules/gpu/CMakeLists.txt
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_imgproc.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/initialization.cpp
modules/stitching/src/matchers.cpp
modules/video/src/video_init.cpp
modules/videostab/src/global_motion.cpp
2013-06-19 15:25:37 +04:00
Roman Donchenko
d58421c08e
Make version-related test properties more useful.
...
Namely, normalize their names to a common convention and remove useless text
from their values.
2013-06-19 14:45:03 +04:00
Roman Donchenko
1aa7b1596b
Merge pull request #1023 from pengx17:2.4_fix_amd_path
2013-06-19 14:43:29 +04:00
yao
f1c549fabf
revise ocl samples, add tvl1 sample
2013-06-19 16:36:23 +08:00
Roman Donchenko
84262acbf0
Merge pull request #1012 from apavlenko:fix_3077
2013-06-19 12:25:23 +04:00
Roman Donchenko
fa158304fe
Merge pull request #1016 from SpecLad:xls-report
2013-06-19 12:24:34 +04:00
Roman Donchenko
dd23a3c227
Merge pull request #1020 from SpecLad:tests-record-more
2013-06-19 12:24:05 +04:00
Vladislav Vinogradov
4b983679a5
fix gpuarithm module compilation (Bug #3103 )
2013-06-19 10:13:33 +04:00
yao
2c198f6cd6
revise accuracy and perf tests
2013-06-19 13:03:35 +08:00
peng xiao
9ecbce0111
Fix cmake path finding for amd libs.
...
There is no WIN64 defined in the environment.
2013-06-19 11:31:42 +08:00
yao
26c246140a
optimize hog
2013-06-19 11:20:45 +08:00
Roman Donchenko
25613fbfd7
Merge pull request #1008 from ivan-korolev:fix_sift_bug_2892
2013-06-18 18:32:03 +04:00
Roman Donchenko
4af7d65224
Made tests record information about CPU features and Tegra optimization status.
2013-06-18 18:26:53 +04:00
Roman Donchenko
24d84a45b1
Made tests record in the XML output which parallel framework was used.
2013-06-18 18:26:53 +04:00
