Vadim Pisarevsky
8762ee3f6f
removed unnecessary opencl kernels
11 years ago
Vadim Pisarevsky
d914f20a4c
updated patch to bring in the first functions with "transparent API"
11 years ago
Roman Donchenko
bb4bf7a1f9
Merge pull request #1811 from Nerei:fixed_some_build_errors
11 years ago
Anatoly Baksheev
9e3a29701e
Viz code beautification
11 years ago
Anatoly Baksheev
efcc341219
added viz tutorial 3 test
11 years ago
Anatoly Baksheev
e154bce259
fixed compilation for vs2008
11 years ago
Anatoly Baksheev
d8600d3d13
fixed all Viz warnings
...
moved some headers to precomp.hpp
11 years ago
Anatoly Baksheev
5c6248005a
fixed warnings
11 years ago
Anatoly Baksheev
dfef42f94e
Fixed Viz compilation: removed CV_EXPORTS from cv::viz::Color. The macro forced instantiation of all Matx<double, 4, 1> constructors and triggered StaticAssert there.
11 years ago
Anatoly Baksheev
0dad070473
Fixed compilation errors: removed using namespace from hpp file. This led to pulling cv::ACCESS_MASK to global namespace where conflict with the same name in 'windows.h'
11 years ago
Anatoly Baksheev
d275e29ea4
compilation & warnings
11 years ago
Roman Donchenko
b8c46f4cce
Merge pull request #1804 from alekcac:youtube_link_fix
11 years ago
Roman Donchenko
bb0d88cf6f
Merge pull request #1801 from vrabaud:master
11 years ago
Alexander Shishkov
4c9a6bd4ec
Update widget_pose.rst
...
changed Youtube link to our channel
11 years ago
Vincent Rabaud
154d119e13
do not use include_directories when calling find_package(OpenCV)
...
This is something that should be left to the user, that's the whole
point of OpenCV_INCLUDE_DIRS.
11 years ago
Roman Donchenko
a8e1d1f0b2
Merge pull request #1791 from prattmic:limit
11 years ago
Michael Pratt
73f1940b03
Add missing limits include
...
Without limits included, several CUDA related files fail to compile with
GCC on Ubuntu:
modules/cudaimgproc/src/hough_lines.cpp:136:9: error: ‘numeric_limits’ is not a member of ‘std’
11 years ago
Roman Donchenko
f461930d07
Merge pull request #1781 from SpecLad:merge-2.4
11 years ago
Roman Donchenko
ccbd7f8da9
Added a citation which used to be in the gpu module in 2.4.
11 years ago
Roman Donchenko
bfa40e180f
Removed another usage of __func__, following #1763 .
11 years ago
Roman Donchenko
4f1aed98de
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
.gitignore
modules/contrib/src/detection_based_tracker.cpp
modules/core/include/opencv2/core/core.hpp
modules/core/include/opencv2/core/internal.hpp
modules/core/src/gpumat.cpp
modules/core/src/opengl.cpp
modules/gpu/src/cuda/safe_call.hpp
modules/highgui/src/cap.cpp
modules/imgproc/include/opencv2/imgproc/imgproc.hpp
modules/ocl/doc/image_processing.rst
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_haar.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/kmeans.cpp
modules/ocl/src/svm.cpp
modules/ocl/test/test_objdetect.cpp
samples/ocl/adaptive_bilateral_filter.cpp
11 years ago
Roman Donchenko
469d7eed72
Merge pull request #1767 from prattmic:python3_asstring
11 years ago
Roman Donchenko
c970d4bf6e
Merge pull request #1742 from pengx17:master_ocl_retina_sample
11 years ago
Roman Donchenko
0ac61240c5
Merge pull request #1771 from kiranpradeep:2.4
11 years ago
Kiran Pradeep
5852a913a8
CMake's get_filename_component with NAME_WE parameters, interprets first period as start of extension. For. e.g file name with out extension of 'this.is.a.text.file.txt' will be taken as 'this'. Hence using NAME with regex replacement to get 'this.is.a.text.file'
11 years ago
Roman Donchenko
800d53f76b
Merge pull request #1759 from ilya-lavrenov:ocl_distanceToCenters
11 years ago
Roman Donchenko
0be2752366
Merge pull request #1755 from KonstantinMatskevich:dump_info
11 years ago
Roman Donchenko
0fb629915f
Merge pull request #1763 from SpecLad:cv-func
11 years ago
Michael Pratt
8aafd569c8
Support PyString_AsString() in Python 3 < 3.3
...
In Python 3, version 3.3+, PyUnicode_AsUTF8() provides similar
functionality to Python 2's PyString_AsString().
In older versions of Python 3, there is no public function to provide
the same functionality. However, the "internal" _PyUnicode_AsString()
does provide that functionality, so use it to replace
PyString_AsString().
With this patch, cv2 should compile for Python 3.[0-2].
11 years ago
Roman Donchenko
07db81a4bb
Merge pull request #1760 from ilya-lavrenov:ocl_remap_nn
11 years ago
Roman Donchenko
2c38be079e
Enabled CV_Assert and such to print the function name with Visual C++.
...
Also, I made a separate macro for the current function name, which
helps simplify a lot of code that uses it.
11 years ago
Konstantin Matskevich
e9edfd1c54
update
11 years ago
Roman Donchenko
641bb7ac6b
Merge pull request #1737 from vrabaud:2.4
11 years ago
Ilya Lavrenov
fa15769f39
added CV_16SC2 && CV_16UC1 maps support to ocl::remap (nearest neighbour only)
11 years ago
Ilya Lavrenov
56d943388d
speeded up ocl::distanceToCenters
11 years ago
Andrey Pavlenko
296f76a135
Merge pull request #1756 from alalek:ocl_workaround_memory_leaks_with_subbuffer
11 years ago
Andrey Pavlenko
9afe65e5c0
Merge pull request #1758 from apavlenko:adaptive_bilateral_filter
11 years ago
Roman Donchenko
bca63083a8
Merge pull request #1757 from asmorkalov:android_manager_version_inc2
11 years ago
Harris Gasparakis
a1de91a4fd
Cleaned up adaptive bilateral filtering, added support for gaussian interpolation, updated sample and docs
11 years ago
Roman Donchenko
254aece317
Merge pull request #1753 from abidrahmank:py_tutorials
11 years ago
Konstantin Matskevich
5304e9f259
extending openCL info dump
11 years ago
Roman Donchenko
370235c07b
Merge pull request #1711 from SpecLad:cap-broken-mat
11 years ago
Alexander Smorkalov
24f369c4ac
Android Manager Version++.
11 years ago
Alexander Alekhin
03646e7e01
ocl: workaround for subbuffer memory leaks
11 years ago
Roman Donchenko
b5777efee6
Merge pull request #1716 from ilya-lavrenov:resize_area_sse2_fix
11 years ago
Ilya Lavrenov
e9b54ab844
fixed cv::resize (area fast mode) - it writes outside of array boundary in SSE2 version
11 years ago
Andrey Pavlenko
43c9157220
Merge pull request #1750 from alalek:ocl_update_documentation
11 years ago
Andrey Pavlenko
a3fa7a243d
Merge pull request #1740 from ilya-lavrenov:ocl_corners
11 years ago
Andrey Pavlenko
95767676b7
Merge pull request #1739 from pengx17:2.4_ocl_overload_haar
11 years ago
Roman Donchenko
5c44afa427
Merge pull request #1743 from ilya-lavrenov:ocl_repeat
11 years ago