mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-12-15 18:09:11 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
11,254 Commits 6 Branches 127 Tags 3 GiB
435028ccee
Commit Graph

11254 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ilya Lavrenov
65b7e2018c fixed kernel compilation 2013-11-21 14:22:24 +04:00
Ilya Lavrenov
d764af5318 added extra parameters to ocl::cvtColor performance test 2013-11-21 12:53:21 +04:00
Roman Donchenko
6b23cb5b02 Merge pull request #1795 from alalek:perf_report_progress 2013-11-21 12:31:36 +04:00
Roman Donchenko
b8f5fcf3f9 Merge pull request #1776 from philippefoubert:merge_upstream_2.4_ximea 2013-11-21 12:03:02 +04:00
Roman Donchenko
623a02c69f Merge pull request #1834 from SpecLad:svm-copy-ctor 2013-11-21 11:55:20 +04:00
Alexander Alekhin
c1541c9e79 perf report: summary.py: added --progress mode 2013-11-20 19:57:20 +04:00
Andrey Pavlenko
8d1a8df1a9 Merge pull request #1824 from vpisarev:ocl_experiments5 2013-11-20 19:14:40 +04:00
Roman Donchenko
70a4de20d7 Merge pull request #1836 from ilya-lavrenov:ocl_norm_workaround 2013-11-20 18:19:08 +04:00
Alexander Shishkov
9631cb6de9 fix for supporting 64-bit architecture 2013-11-20 18:08:05 +04:00
Roman Donchenko
f6283432ff Merge pull request #1833 from SpecLad:fix-qt-sample 2013-11-20 17:59:35 +04:00
Roman Donchenko
3703c7040a Merge pull request #1828 from SpecLad:merge-2.4 2013-11-20 16:08:53 +04:00
Roman Donchenko
8ac3ddf421 Merge pull request #1829 from SpecLad:config-components-libs 2013-11-20 15:57:14 +04:00
Ilya Lavrenov
60b59eeb73 workaround for AMD bug: UNREACHABLE EXECUTED 2013-11-20 15:40:56 +04:00
Roman Donchenko
cf00349b5b Gave CvSVM a private copy constructor & assignment operator. 
The implicitly generated ones don't work properly, and I don't want to
write proper ones. :-)

"Fixes" <http://code.opencv.org/issues/3358>.
 2013-11-20 14:59:42 +04:00
Roman Donchenko
b8283edfca Fix the Qt sample, broken after #1722. 2013-11-20 14:57:21 +04:00
Roman Donchenko
4cfbee70bd Simplified the Windows implementation of CV_XADD. 
_InterlockedExchangeAdd is a Visual Studio intrinsic that's available
for all architectures and in all VS versions that we care about. It's also
faster than the underscore-less function, since it's an intrinsic.
We also don't need to declare it ourselves.

It is, however, a Visual Studio-specific intrinsic, so I changed the
preprocessing condition accordingly.

Fixes <http://code.opencv.org/issues/3365>.
 2013-11-20 13:47:35 +04:00
Roman Donchenko
b197ec9413 Merge pull request #1761 from bhuroc:qtkit-video-file-2.4 2013-11-20 13:36:37 +04:00
Roman Donchenko
95006af170 Merge pull request #1816 from SpecLad:no-more-epoch 2013-11-20 11:52:54 +04:00
Roman Donchenko
63b3db53d7 Merge pull request #1830 from SpecLad:config-includes 2013-11-20 11:52:30 +04:00
Vadim Pisarevsky
ae8b2cbd68 fixed bug with cl_long size on Win32 (thanks to Aaron Kunze) 2013-11-19 20:51:31 -05:00
Vadim Pisarevsky
677c7f27cb fixed failure in Tonemap test 2013-11-19 19:20:24 -05:00
Philippe FOUBERT
78e16a906b Back to the previous coding way (using the macro with the goto). 2013-11-19 21:51:47 +01:00
Roman Donchenko
ef27ac3782 In the example in OpenCVConfig.cmake.in, explicitly add the include paths. 
After #1801, the include directories are no longer added automatically,
so we should show the user how to do that.
 2013-11-19 19:00:56 +04:00
Roman Donchenko
7f935717cb In OpenCVConfig.cmake.in, lowercased the commands in the example. 
This is the preferred style nowadays, and more consistent with the
rest of the code.
 2013-11-19 18:58:33 +04:00
Roman Donchenko
4037a4f227 Fixed OpenCV_LIBS when find_package has been used with explicit components. 
Fixes <http://answers.opencv.org/question/23997/opencv-247-cmake-includes-all-modules-even-if-i/>.
 2013-11-19 18:44:17 +04:00
Roman Donchenko
e69d2c1bb1 Merge pull request #1819 from ilya-lavrenov:ocl_resize_AREA 2013-11-19 16:25:47 +04:00
Roman Donchenko
aacf188e83 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/src/arithm.cpp
	modules/ocl/src/build_warps.cpp
	modules/ocl/src/color.cpp
	modules/ocl/src/haar.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/split_merge.cpp
	modules/ocl/test/test_color.cpp
	samples/cpp/3calibration.cpp
	samples/cpp/OpenEXRimages_HDR_Retina_toneMapping.cpp
	samples/cpp/OpenEXRimages_HDR_Retina_toneMapping_video.cpp
	samples/cpp/Qt_sample/main.cpp
	samples/cpp/camshiftdemo.cpp
	samples/cpp/descriptor_extractor_matcher.cpp
	samples/cpp/distrans.cpp
	samples/cpp/generic_descriptor_match.cpp
	samples/cpp/grabcut.cpp
	samples/cpp/morphology2.cpp
	samples/cpp/segment_objects.cpp
	samples/cpp/stereo_calib.cpp
	samples/cpp/tutorial_code/Histograms_Matching/compareHist_Demo.cpp
	samples/cpp/tutorial_code/core/mat_mask_operations/mat_mask_operations.cpp
	samples/cpp/tutorial_code/introduction/display_image/display_image.cpp
	samples/cpp/tutorial_code/introduction/windows_visual_studio_Opencv/Test.cpp
	samples/cpp/tutorial_code/objectDetection/objectDetection.cpp
	samples/cpp/tutorial_code/objectDetection/objectDetection2.cpp
	samples/cpp/video_dmtx.cpp
 2013-11-19 16:21:09 +04:00
Roman Donchenko
5c77784ac9 Merge pull request #1827 from asmorkalov:android_ndk_r9b 2013-11-19 14:53:16 +04:00
Roman Donchenko
0a90a36a1f Merge pull request #1793 from SpecLad:external-docs-1 2013-11-19 14:21:48 +04:00
Roman Donchenko
c47190ef90 Merge pull request #1787 from hs3180:2.4 2013-11-19 14:21:25 +04:00
Ilya Lavrenov
198cd1a40d added area fast mode to ocl::resize 2013-11-19 13:43:50 +04:00
Roman Donchenko
4746a710bb Merge pull request #1820 from asmorkalov:android_native_camera_44 2013-11-19 12:47:48 +04:00
Roman Donchenko
3e55d705cc Merge pull request #1823 from ilya-lavrenov:ocl_abs_sum 2013-11-19 12:34:09 +04:00
Roman Donchenko
56f791679b Merge pull request #1825 from jet47:fix-opengl-mem-leak 2013-11-19 12:31:53 +04:00
Roman Donchenko
68d1110cde Merge pull request #1821 from SpecLad:watch-your-slashes 2013-11-19 12:29:55 +04:00
Alexander Smorkalov
e08b075db0 Android NDK r9b support added. 2013-11-19 11:46:29 +04:00
Vladislav Vinogradov
66221a32b9 fixed memory leak in ogl::Texture2D 2013-11-19 10:12:22 +04:00
Vadim Pisarevsky
d0b3c7a518 added some diagnostic into Tonemap test 2013-11-18 23:14:44 -05:00
Vadim Pisarevsky
8c44995ea6 another attempt to fix compile errors 2013-11-18 22:15:04 -05:00
Vadim Pisarevsky
241002384c fixed some more compile errors 2013-11-18 14:26:19 -05:00
Vadim Pisarevsky
e2bbe7597b fixed few compile errors and doc build errors 2013-11-18 13:48:04 -05:00
Vadim Pisarevsky
8762ee3f6f removed unnecessary opencl kernels 2013-11-18 12:02:10 -05:00
Vadim Pisarevsky
d914f20a4c updated patch to bring in the first functions with "transparent API" 2013-11-18 11:48:00 -05:00
Ilya Lavrenov
c0456df611 workaround for ocl::absSum (eliminated error: unreachable executed) 2013-11-18 20:38:39 +04:00
Roman Donchenko
85f92fabbd Merge pull request #1815 from asmorkalov:android_native_camera_build_automation 2013-11-18 19:44:33 +04:00
Roman Donchenko
239704f986 Added Visual Studio 2013 detection. 2013-11-18 19:39:39 +04:00
Roman Donchenko
7973594a01 Removed all slashes after ${OpenCV_INSTALL_BINARIES_PREFIX}. 
If it's followed by a slash and OpenCV_INSTALL_BINARIES_PREFIX is empty,
then the resulting path becomes absolute.

Fixes <http://code.opencv.org/issues/3350>.
 2013-11-18 19:21:31 +04:00
Ilya Lavrenov
f70d63e4c9 added INTER_AREA interpolation to ocl::resize 2013-11-18 18:28:49 +04:00
Alexander Smorkalov
26d3a1a036 Prebuilt libnative_camera_xxx updated. 2013-11-18 18:19:38 +04:00
Roman Donchenko
bb4bf7a1f9 Merge pull request #1811 from Nerei:fixed_some_build_errors 2013-11-18 18:09:44 +04:00