Tree: b8c46f4cce

Commit Graph

11013 Commits (b8c46f4cce61d9844adc656202c4347d1af8bd3d)

 

All Branches   

Search

Author	SHA1	Message	Date
Roman Donchenko	b8c46f4cce	Merge pull request #1804 An error occurred from alekcac:youtube_link_fix	11 years ago
Roman Donchenko	bb0d88cf6f	Merge pull request #1801 An error occurred 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 An error occurred 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 An error occurred 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 An error occurred .	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 An error occurred from prattmic:python3_asstring	11 years ago
Roman Donchenko	c970d4bf6e	Merge pull request #1742 An error occurred from pengx17:master_ocl_retina_sample	11 years ago
Roman Donchenko	0ac61240c5	Merge pull request #1771 An error occurred 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 An error occurred from ilya-lavrenov:ocl_distanceToCenters	11 years ago
Roman Donchenko	0be2752366	Merge pull request #1755 An error occurred from KonstantinMatskevich:dump_info	11 years ago
Roman Donchenko	0fb629915f	Merge pull request #1763 An error occurred 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 An error occurred 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 An error occurred 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 An error occurred from alalek:ocl_workaround_memory_leaks_with_subbuffer	11 years ago
Andrey Pavlenko	9afe65e5c0	Merge pull request #1758 An error occurred from apavlenko:adaptive_bilateral_filter	11 years ago
Roman Donchenko	bca63083a8	Merge pull request #1757 An error occurred 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 An error occurred from abidrahmank:py_tutorials	11 years ago
Konstantin Matskevich	5304e9f259	extending openCL info dump	11 years ago
Roman Donchenko	370235c07b	Merge pull request #1711 An error occurred 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 An error occurred 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 An error occurred from alalek:ocl_update_documentation	11 years ago
Andrey Pavlenko	a3fa7a243d	Merge pull request #1740 An error occurred from ilya-lavrenov:ocl_corners	11 years ago
Andrey Pavlenko	95767676b7	Merge pull request #1739 An error occurred from pengx17:2.4_ocl_overload_haar	11 years ago
Roman Donchenko	5c44afa427	Merge pull request #1743 An error occurred from ilya-lavrenov:ocl_repeat	11 years ago
Peng Xiao	7a2a810de5	Update retina_ocl.cpp	11 years ago
Roman Donchenko	8b19df3fec	Merge pull request #1748 An error occurred from SpecLad:merge-2.4	11 years ago
Roman Donchenko	65389e41db	Revert commit 994e07db0 (PR #1715 An error occurred ), because it's irrelevant for master. ... Conflicts: modules/java/generator/src/cpp/VideoCapture.cpp	11 years ago
abidrahmank	8bba305487	small correction in Py tutorials	11 years ago
peng xiao	53d1873776	Revert back test image.	11 years ago
Alexander Alekhin	3952a0df44	ocl: update comments in ocl.hpp	11 years ago
Alexander Alekhin	5a333bfff4	ocl: update documentation	11 years ago
Andrey Pavlenko	be37d99567	Merge pull request #1752 An error occurred from alalek:ocl_memory_cleanup_workaround	11 years ago
Andrey Pavlenko	14c3560750	Merge pull request #1751 An error occurred from ilya-lavrenov:ocl_copyMakeBorder_test_fix	11 years ago
Andrey Pavlenko	14b2eed17b	Merge pull request #1745 An error occurred from alalek:ocl_fix_svm_with_blas	11 years ago
Alexander Alekhin	691d5f4187	ocl: memory cleanup workaround: clFinish() before clReleaseMemObject() + 64kb memory guard	11 years ago