alexandre benoit
188f889949
Merge branch 'master' of code.opencv.org:opencv
12 years ago
Andrey Pavlenko
70deda354a
Merge pull request #1047 from jet47:gpustream-remove-obsolete
12 years ago
Andrey Pavlenko
89086bdb8d
Merge pull request #1046 from SpecLad:merge-2.4
12 years ago
Roman Donchenko
4f19216e45
Merge pull request #1036 from jet47:fix-gpu-deviceinfo
12 years ago
Roman Donchenko
c1f8d9e3d2
Merge pull request #1011 from wecacuee:master
12 years ago
Vikas Dhiman
f15dc72b89
Removed misleading comment and added the divisibility test to ::run function.
12 years ago
Roman Donchenko
53afdb4b30
Merge pull request #1041 from abidrahmank:master
12 years ago
Vladislav Vinogradov
3c32fc1329
removed obsolete methods from gpu::Stream
12 years ago
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
12 years ago
Roman Donchenko
1dccf5743e
Merge pull request #1024 from jet47:fix-gpuarithm-compilation
12 years ago
abidrahmank
a1ea1a7ec5
boxpoints documentation
12 years ago
abidrahmank
bcf9117957
Added missing python functions in highgui documentation
...
setMouseCallback
createTrackbar
12 years ago
Roman Donchenko
3bab7391d0
Merge pull request #1028 from SpecLad:ocl-clahe-dtor
12 years ago
Roman Donchenko
171a56fe82
Merge pull request #1034 from pengx17:2.4_oclmat_inoutarray
12 years ago
Roman Donchenko
7cb047e2d9
Merge pull request #1031 from pengx17:2.4_fix_converTo
12 years ago
Roman Donchenko
4ed3d33dd7
Merge pull request #1025 from bitwangyaoyao:2.4_tests
12 years ago
Roman Donchenko
b0421cafab
Merge pull request #1022 from bitwangyaoyao:2.4_hog
12 years ago
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)
12 years ago
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
12 years ago
Roman Donchenko
5fa200763f
Merge pull request #1026 from SpecLad:ts-version-prop
12 years ago
Roman Donchenko
eff6dccb3b
Merge pull request #1014 from jet47:gpustereo-refactoring
12 years ago
Roman Donchenko
b20c9ad2d1
Merge pull request #1015 from SpecLad:merge-2.4
12 years ago
Roman Donchenko
e3ae36dcb3
Merge pull request #1033 from SpecLad:xls++
12 years ago
Roman Donchenko
84639e444b
Merge pull request #1010 from jet47:gpufilters-refactoring
12 years ago
peng xiao
290c8db0a8
Revise naming for getOclMat function.
12 years ago
yao
6326739b44
a bug fix in stereo_match sample
12 years ago
peng xiao
e129638263
Add a workaround to interpolate between oclMat and Input/OutputArray.
12 years ago
Roman Donchenko
57317c3196
Use log formatting as intended.
12 years ago
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.
12 years ago
Roman Donchenko
13323882d4
Merge pull request #1027 from jet47:fix-cuda-4.2-build
12 years ago
Roman Donchenko
e600beb484
Merge pull request #1017 from jet47:fix-gpu-warnings
12 years ago
Vladislav Vinogradov
f08d75a84b
removed obsolete API
12 years ago
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.
12 years ago
Roman Donchenko
1d9660c6d2
Merge pull request #954 from LeszekSwirski:24_fix-qtwindow
12 years ago
Roman Donchenko
1ed5fb937d
Give cv::ocl::CLAHE a virtual destructor, for the usual reasons.
12 years ago
Vladislav Vinogradov
50166d2734
fixed compilation with CUDA 4.2
12 years ago
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
12 years ago
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.
12 years ago
Roman Donchenko
1aa7b1596b
Merge pull request #1023 from pengx17:2.4_fix_amd_path
12 years ago
yao
f1c549fabf
revise ocl samples, add tvl1 sample
12 years ago
Roman Donchenko
84262acbf0
Merge pull request #1012 from apavlenko:fix_3077
12 years ago
Roman Donchenko
fa158304fe
Merge pull request #1016 from SpecLad:xls-report
12 years ago
Roman Donchenko
dd23a3c227
Merge pull request #1020 from SpecLad:tests-record-more
12 years ago
Vladislav Vinogradov
4b983679a5
fix gpuarithm module compilation (Bug #3103 )
12 years ago
yao
2c198f6cd6
revise accuracy and perf tests
12 years ago
peng xiao
9ecbce0111
Fix cmake path finding for amd libs.
...
There is no WIN64 defined in the environment.
12 years ago
yao
26c246140a
optimize hog
12 years ago
Roman Donchenko
25613fbfd7
Merge pull request #1008 from ivan-korolev:fix_sift_bug_2892
12 years ago
Roman Donchenko
4af7d65224
Made tests record information about CPU features and Tegra optimization status.
12 years ago
Roman Donchenko
24d84a45b1
Made tests record in the XML output which parallel framework was used.
12 years ago