mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-26 04:00:30 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
12,293 Commits 6 Branches 126 Tags 3 GiB
c7fe162829
Commit Graph

1550 Commits

Author SHA1 Message Date
Vadim Pisarevsky
f41f633d2d fixed various warnings from the “doc” and other builders 2013-12-19 16:31:30 +04:00
Vadim Pisarevsky
a1784b7320 converted old haar cascades to the new format; added the conversion function; added OpenCL optimization into CascadeClassfier; optimized the data structures and CPU code for the stump case. 2013-12-19 14:48:42 +04:00
Ilya Lavrenov
b3af0e3154 added cv::repeat to T-API 2013-12-19 14:28:09 +04:00
Ilya Lavrenov
c8cbfe5382 added cv::dft T-API test 2013-12-19 13:42:16 +04:00
Alexander Smorkalov
64c94cb22c CUDA related func tables refactored to remove unneeded dependencies. 2013-12-19 11:18:04 +04:00
Alexander Smorkalov
6da7c50fb5 Make dependency from CUDA explicit to prevent from fake dependedcies from CUDA runtime. 2013-12-19 10:27:38 +04:00
Alexander Smorkalov
442082eb0f Fixes for Android support. 2013-12-19 09:38:46 +04:00
Andrey Pavlenko
59cab94fc7 Merge pull request #1997 from alalek:tapi_fix_memleaks 2013-12-18 13:53:17 +04:00
Andrey Pavlenko
388d0ef182 Merge pull request #2004 from ilya-lavrenov:tapi_umat_copyto 2013-12-18 13:46:14 +04:00
Alexander Smorkalov
be530bd085 DeviceInfo class method that were implemented in header moved to cpp file. 2013-12-18 12:02:15 +04:00
Ilya Lavrenov
3a6d248bee typo 2013-12-17 17:41:28 +04:00
Andrey Pavlenko
bd91b39593 Merge pull request #1917 from alalek:ocl_d3d 2013-12-17 16:44:27 +04:00
Andrey Pavlenko
586a5cb6db Merge pull request #1969 from KonstantinMatskevich:ocl_tapi_minmaxloc 2013-12-17 16:42:44 +04:00
Andrey Pavlenko
d3fa2bfe8c Merge pull request #1998 from ilya-lavrenov:tapi_gemm 2013-12-17 16:41:59 +04:00
Ilya Lavrenov
ac030c16f1 fixed UMat::copyTo(UMat) 2013-12-17 15:23:39 +04:00
Vadim Pisarevsky
9d3e7e027a almost finished opencl-ization of cascade classifier 2013-12-17 14:29:30 +04:00
Roman Donchenko
52a785e95a Merge pull request #1996 from SpecLad:merge-2.4 2013-12-17 13:21:48 +04:00
Konstantin Matskevich
5cf4166801 some fixes 2013-12-17 12:43:21 +04:00
Konstantin Matskevich
904dac7670 minMaxLoc 2013-12-17 12:43:21 +04:00
Alexander Smorkalov
88a883e68e Build fix. 2013-12-17 10:24:00 +04:00
Ilya Lavrenov
2f34bb9aa0 added cv::gemm to T-API 2013-12-16 19:12:27 +04:00
Roman Donchenko
f2befa01f4 Fixed build for the TLS-related stuff. 2013-12-16 18:45:41 +04:00
Alexander Alekhin
9cb31e86ae umat: fix memory leaks 2013-12-16 16:46:36 +04:00
Roman Donchenko
9d8d70d6ca Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	doc/tutorials/definitions/tocDefinitions.rst
	modules/core/include/opencv2/core/core.hpp
	modules/core/src/system.cpp
	modules/features2d/src/freak.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/src/cl_context.cpp
	modules/ocl/test/test_api.cpp
 2013-12-16 15:02:12 +04:00
Alexander Smorkalov
8660e048bc Dynamic CUDA support library loading implemented for Linux. 
Logical mistake in macro fixed;
DeviceInfo deligate reimplemented;
Build and warning fixes.
 2013-12-16 14:46:44 +04:00
Alexander Smorkalov
d4087f19a2 All CUDA related stuff were moved to separate dynamic library. 2013-12-16 14:46:44 +04:00
Peter Andreas Entschev
f44de302a0 cv::completeSymm fixed to work with any OpenCV data type and multiple channels. 2013-12-15 20:56:55 -02:00
Ilya Lavrenov
558c4a2b1d implemented UMat::convertTo 2013-12-15 14:15:30 +04:00
Andrey Pavlenko
c9ed05c3bd Merge pull request #1981 from ilya-lavrenov:tapi_sqrt 2013-12-13 19:34:28 +04:00
Alexander Alekhin
11b9d5bf4d core: added DirectX interop implementation (OpenCL) with samples 2013-12-13 19:02:41 +04:00
Ilya Lavrenov
e30875bcef fixed UMat sync problems 2013-12-13 18:38:12 +04:00
Ilya Lavrenov
1d6715e58a added cv::sqrt to T-API (using built-in sqrt OpenCL function) 2013-12-12 18:12:30 +04:00
Andrey Pavlenko
b0a9220de8 Merge pull request #1889 from alalek:ocl_core_dynamic_runtime 2013-12-12 17:27:34 +04:00
Ilya Lavrenov
b20714a8a8 fixed kernel compilation of cv::min, cv::max for CV_64F 2013-12-12 02:42:24 +04:00
Andrey Pavlenko
f3e2bfea79 Merge pull request #1970 from ilya-lavrenov:tapi_checks 2013-12-11 21:37:10 +04:00
Alexander Alekhin
a118577a57 core: added TLS support 2013-12-11 18:50:11 +04:00
Alexander Alekhin
3bbf51fbfb ocl: disabled test for Split (there are problems with OutputArray and getMatRef) 2013-12-11 16:46:08 +04:00
Alexander Alekhin
d0114b24e0 core/ocl: replace dynamic runtime 2013-12-11 15:56:54 +04:00
Alexander Alekhin
9f388a2be7 core/ocl: autogenerated files for dynamic runtime 2013-12-11 15:56:54 +04:00
Alexander Alekhin
5ecf759742 core/ocl: update dynamic runtime 2013-12-11 15:56:54 +04:00
Alexander Alekhin
381d7851b7 core/ocl: move opencl dynamic runtime from ocl module 2013-12-11 15:56:54 +04:00
Alexander Alekhin
bdbd3eb2bf ocl: process termination hung workaround 2013-12-11 00:31:34 +04:00
Ilya Lavrenov
5566d31468 more strict checks outside ROI 2013-12-10 19:30:14 +04:00
Roman Donchenko
9d87f9c974 Merge pull request #1956 from ilya-lavrenov:tapi_split_merge 2013-12-09 16:56:06 +04:00
Roman Donchenko
24465bbd05 Merge pull request #1855 from Nerei:master 2013-12-09 14:13:40 +04:00
Roman Donchenko
8db53c1760 Merge pull request #1883 from philippefoubert:branch_matx_inv 2013-12-09 14:07:10 +04:00
Anatoly Baksheev
262f70f3ab cv::format declaration in default headers 2013-12-08 19:00:53 +04:00
Ilya Lavrenov
c16c9a2e8e added cv::split to T-API 2013-12-08 16:30:17 +04:00
Ilya Lavrenov
b6c33bf86b added cv::norm to T-API 2013-12-08 15:27:48 +04:00
Ilya Lavrenov
cd3f7fbf05 added cv::merge to T-API 2013-12-08 13:49:28 +04:00
Anatoly Baksheev
546c084fe6 fixed shadow error and added ocv_disable_module 2013-12-07 18:58:27 +04:00
Anatoly Baksheev
ace71cef3f Added Affine3<T>::rvec() 2013-12-07 18:50:45 +04:00
Anatoly Baksheev
9f1f5aed53 compilation 2013-12-07 18:50:44 +04:00
Anatoly Baksheev
a9c7aa92d9 removed CV_EXPORTS from cv::Afiine 2013-12-07 18:50:44 +04:00
GregoryMorse
68d8f6410f Update system.cpp 
Cleaned up to use the preferred namespace code.  This can be further simplified by using the HString/HStringReference classes from wrl\wrappers\corewrappers.h
 2013-12-07 15:40:30 +08:00
Andrey Pavlenko
a0c296fcdb Merge pull request #1936 from ElenaGvozdeva:ocl_flip 2013-12-06 16:40:30 +04:00
Andrey Pavlenko
f2cf9dd8bf updating version to 2.4.7.2 2013-12-06 16:21:22 +04:00
Andrey Pavlenko
c34fc180a7 Merge pull request #1762 from jet47:cuda-6.0-npp-fix 2013-12-06 15:56:15 +04:00
Elena Gvozdeva
f5a01f15a5 Fixed test for ocl_flip 2013-12-06 15:53:00 +04:00
Ilya Lavrenov
3eaa8f149b added cv::intergal to T-API 2013-12-06 13:18:25 +04:00
Elena Gvozdeva
b930028727 Added cv::flip using Transparent API 2013-12-05 17:54:05 +04:00
Andrey Pavlenko
458ac2592b Merge pull request #1908 from ilya-lavrenov:tapi_imgproc 2013-12-04 21:41:44 +04:00
Roman Donchenko
0736ede7e5 Merge pull request #1914 from SpecLad:merge-2.4 2013-12-04 16:30:57 +04:00
Ilya Lavrenov
e2b99a32b2 added cv::threshold to T-API 2013-12-04 13:45:44 +04:00
Ilya Lavrenov
474fc887a6 added cv::copyMakeBorder to T-API 2013-12-04 13:41:35 +04:00
Andrey Pavlenko
f9190cc662 Merge pull request #1909 from alalek:ocl_tapi_perf 2013-12-04 11:35:11 +04:00
Andrey Pavlenko
e585f145f6 Merge pull request #1903 from ilya-lavrenov:tapi_warp 2013-12-04 11:34:52 +04:00
Ilya Lavrenov
49474903cb refactoring 2013-12-04 00:51:55 +04:00
Ilya Lavrenov
49e729f89d ability to use cv::PSNR with transparent cv::norm 2013-12-04 00:51:55 +04:00
Ilya Lavrenov
88bceb5060 added cv::meanStdDev to T-API 2013-12-04 00:51:55 +04:00
Ilya Lavrenov
b8edc2cc4d added cv::sum to T-API 2013-12-04 00:51:43 +04:00
Ilya Lavrenov
28575c1969 added cv::countNonZero to T-API 2013-12-04 00:51:32 +04:00
Ilya Lavrenov
fed7e61879 added cv::repeat to T-API (fix for copyTo -> UMat is needed) 2013-12-04 00:50:03 +04:00
Ilya Lavrenov
e17107e864 added cv::compare to T-API 2013-12-04 00:50:03 +04:00
Ilya Lavrenov
a180cebb2d added cv::polarToCart to T-API 2013-12-04 00:50:03 +04:00
Ilya Lavrenov
ba850f0b64 added cv::cartToPolar to T-API 2013-12-04 00:50:03 +04:00
Ilya Lavrenov
435028ccee added cv::transpose to T-API 2013-12-04 00:50:03 +04:00
Ilya Lavrenov
6ab297718d added setIdentity to T-API 2013-12-04 00:50:03 +04:00
Ilya Lavrenov
3e586f42a0 added cv::pow to T-API 2013-12-04 00:50:02 +04:00
Ilya Lavrenov
997ec60839 added OCL-TAPI arithm tests 2013-12-04 00:50:02 +04:00
Ilya Lavrenov
803672feea added cv::remap to T-API 2013-12-04 00:43:43 +04:00
Ilya Lavrenov
dcce9d7088 added cv::warpAffine to T-API 2013-12-04 00:43:43 +04:00
Ilya Lavrenov
55af7857b9 added cv::warpPerspective to T-API 2013-12-04 00:43:42 +04:00
Alexander Alekhin
7d9150460a core/ocl: added perf test infra + "Add" perf test 2013-12-03 18:43:50 +04:00
Roman Donchenko
90c230678e Merge pull request #1912 from KonstantinMatskevich:ocl_tapi_math 2013-12-03 18:02:44 +04:00
Roman Donchenko
d58cd9851f Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	CMakeLists.txt
	cmake/OpenCVDetectCUDA.cmake
	doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.rst
	modules/core/src/cmdparser.cpp
	modules/gpu/CMakeLists.txt
	modules/gpu/doc/introduction.rst
	modules/gpu/perf/perf_video.cpp
	modules/highgui/doc/reading_and_writing_images_and_video.rst
	modules/ocl/src/cl_context.cpp
	modules/video/include/opencv2/video/background_segm.hpp
	samples/cpp/image_sequence.cpp
	samples/cpp/tutorial_code/ImgTrans/HoughCircle_Demo.cpp
	samples/python/chessboard.py
	samples/python/cvutils.py
	samples/python/demhist.py
	samples/python/dft.py
	samples/python/distrans.py
	samples/python/edge.py
	samples/python/ffilldemo.py
	samples/python/fitellipse.py
	samples/python/houghlines.py
	samples/python/inpaint.py
	samples/python/logpolar.py
	samples/python/morphology.py
	samples/python/numpy_array.py
	samples/python/watershed.py
 2013-12-03 17:35:21 +04:00
Konstantin Matskevich
eaf620ddde small fix 2013-12-03 14:57:13 +04:00
Konstantin Matskevich
14dccdf23d T-API cv::log, cv::exp, cv::magnitude, cv::phase 2013-12-03 14:07:00 +04:00
Roman Donchenko
35ea600c54 Merge pull request #1891 from alalek:cv_error_noreturn 2013-12-03 13:57:35 +04:00
Roman Donchenko
df136339ff Merge pull request #1907 from severin-lemaignan:emscripten-2.4 2013-12-03 13:38:10 +04:00
Séverin Lemaignan
9ce9fc3361 Ensure compilation to Javascript with Emscripten 2013-12-03 09:18:59 +01:00
Roman Donchenko
17f53bc301 Merge pull request #1904 from severin-lemaignan:emscripten 2013-12-03 12:14:09 +04:00
Andrey Pavlenko
0a624ee67d Merge pull request #1901 from vpisarev:ocl_svm3 2013-12-03 11:20:26 +04:00
Vadim Pisarevsky
cd97d789b6 dummy commit to rerun pre-commit tests 2013-12-02 22:15:07 +04:00
Andrey Pavlenko
19ceab13f2 Merge pull request #1590 from ilya-lavrenov:cmd_parser_fix 2013-12-02 20:07:47 +04:00
Vadim Pisarevsky
161c3b71e6 hopefully, now opencv_test_imgproc should pass 2013-12-02 18:27:08 +04:00
Séverin Lemaignan
efe564e3b3 Ensure compilation to Javascript with Emscripten 2013-12-02 14:06:24 +01:00
Vadim Pisarevsky
5fea17ff0d still trying to fix failure in opencv_test_imgproc 2013-12-02 13:46:54 +04:00
Roman Donchenko
b27d7d2a61 Merge pull request #1886 from ilya-lavrenov:tapi_lut 2013-12-02 12:28:18 +04:00
Vadim Pisarevsky
82b852c13c yet another attempt to make Core_UMat.getUMat test work 2013-12-02 00:12:20 +04:00
Vadim Pisarevsky
9be727b1ea another attempt to fix Core_UMat.getUMat test 2013-12-01 23:14:45 +04:00
Vadim Pisarevsky
f263fe145a trying to guess and fix strange failure in core test 2013-12-01 22:14:15 +04:00
Vadim Pisarevsky
d7f4a223cf fixed several compile errors/warnings; reacted on the PR comments 2013-12-01 20:58:30 +04:00
Vadim Pisarevsky
6da5d21331 fixed many bugs related to Mat::getUMat(), asynchronous kernel execution etc. Also, played a bit with ocl::cvtColor vs cv::cvtColor performance 2013-12-01 03:12:19 +04:00
Alexander Alekhin
c1cfb4d422 core: added cv::error with CV_NORETURN attr 2013-11-30 03:43:31 +04:00
Ilya Lavrenov
09795e3265 added cv::resize INTER_AREA to T-API 2013-11-29 17:57:37 +04:00
Andrey Pavlenko
d83094b412 Merge pull request #1880 from ilya-lavrenov:tapi_cvtColor 2013-11-29 12:59:09 +04:00
Roman Donchenko
9ca80961fd Merge pull request #1874 from SpecLad:merge-2.4 2013-11-28 16:43:00 +04:00
Ilya Lavrenov
4eba74ee19 added cv::LUT to T-API 2013-11-28 12:31:04 +04:00
Vladislav Vinogradov
95ebdf4069 fixed compilation with CUDA 6.0: 
GpuMat::setTo function, removed NPP call for CV_8S
 2013-11-28 09:54:34 +04:00
Philippe FOUBERT
22ad487328 Comment correction 2013-11-28 00:45:58 +01:00
Philippe FOUBERT
735f704b3e Add on optional parameter to the matx invert function to know if this operation is successfull without having to analyse the matrix (it may fail in case of bad preconditioning or inappropriate decomposition method) 2013-11-28 00:42:19 +01:00
Ilya Lavrenov
41d046a2db restored ocl_cvtcolor.cl 2013-11-27 23:46:30 +04:00
Ilya Lavrenov
0b900b54e5 RGB[A] <-> HSV 2013-11-27 23:30:29 +04:00
Andrey Pavlenko
96a228fd7e Merge pull request #1866 from ilya-lavrenov:ocl_fix2 2013-11-26 23:27:49 +04:00
Andrey Pavlenko
736097a462 Merge pull request #1868 from KonstantinMatskevich:umat_bugfix 2013-11-26 23:24:51 +04:00
Roman Donchenko
920fd48228 Merge remote-tracking branch 'origin/master' into merge-2.4 
Conflicts:
	modules/ocl/src/arithm.cpp
 2013-11-26 15:32:44 +04:00
Roman Donchenko
9c2272d520 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	.gitignore
	CMakeLists.txt
	doc/CMakeLists.txt
	modules/calib3d/src/stereosgbm.cpp
	modules/core/include/opencv2/core/mat.hpp
	modules/highgui/src/cap_openni.cpp
	modules/ml/include/opencv2/ml/ml.hpp
	modules/objdetect/src/hog.cpp
	modules/ocl/perf/perf_color.cpp
	modules/ocl/src/arithm.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/optical_flow_farneback.cpp
	platforms/scripts/camera_build.conf
	platforms/scripts/cmake_android_all_cameras.py
	samples/cpp/Qt_sample/main.cpp
	samples/cpp/tutorial_code/introduction/windows_visual_studio_Opencv/Test.cpp
 2013-11-26 15:05:26 +04:00
Roman Donchenko
e7339ac11a Merge pull request #1818 from GregoryMorse:patch-2 2013-11-26 13:00:56 +04:00
Roman Donchenko
e20f7014cf Merge pull request #1835 from SpecLad:windows-xadd 2013-11-26 11:43:34 +04:00
Roman Donchenko
05e22ee8c9 Merge pull request #1859 from SpecLad:string-plus-equals 2013-11-26 11:40:37 +04:00
GregoryMorse
e4793e3d5e Update system.cpp 
Fixed to use native C++ instead of C++/CX although it does require significantly more code, it goes along with the spirit of keeping the project in native C++

Update system.cpp

Cleaned up whitespace, removed redundant code and added edge cases for string cleanup

Update system.cpp

Fixed compiler warning over comma operator clause

Update system.cpp

NULL initialization

Update system.cpp

Fixed use of WindowsGetStringRawBuffer which returns internal pointer to buffer

Update system.cpp

Support C++/CX and native C++ through conditional compilation.  Fixed style - long lines, comma operators, long conditional.  Optimized string usage to use reference.

Update system.cpp

Fixed conditional compilation around include and library

Update system.cpp

Fixed trailing space

Update system.cpp

Cleaned up whitespace, removed redundant code and added edge cases for string cleanup

Update system.cpp

Fixed compiler warning over comma operator clause

Update system.cpp

NULL initialization

Update system.cpp

Fixed use of WindowsGetStringRawBuffer which returns internal pointer to buffer

Update system.cpp

Support C++/CX and native C++ through conditional compilation.  Fixed style - long lines, comma operators, long conditional.  Optimized string usage to use reference.

Update system.cpp

Fixed conditional compilation around include and library

Update system.cpp

Fixed trailing space
 2013-11-26 00:22:14 +08:00
Konstantin Matskevich
145855767c bugfix in deallocate 2013-11-25 17:16:22 +04:00
Ilya Lavrenov
9d23a0cb81 fixed ocl_arithm_op; fix for 3-channel images is needed 2013-11-25 14:21:12 +04:00
StevenPuttemans
6f892b10ff Applied feature #3375 and fix of pull 1842 to avoid merging problems later 2013-11-25 10:53:03 +01:00
Roman Donchenko
52e810ed33 Merge pull request #1850 from ilya-lavrenov:pthread_mutex 2013-11-25 12:04:17 +04:00
Alexander Alekhin
fd4a7e7d1f ocl: disable tests 2013-11-23 18:13:32 +04:00
Andrey Pavlenko
b157cc17e9 Merge pull request #1857 from alalek:ocl_ta_tests_infra 2013-11-23 16:44:58 +04:00
Ilya Lavrenov
1af95ea12c fixed error in setting kernel arguments 2013-11-22 18:56:03 +04:00
Alexander Alekhin
881e837520 ocl/core: added prototype for tests 2013-11-22 18:37:44 +04:00
Roman Donchenko
fc49d33c8d Gave cv::String appropriate += operators. 
Note that since String is a reference to an immutable string,
this doesn't actually change the string; it just replaces *this
with a reference to the concatenated string.
 2013-11-22 17:58:40 +04:00
Ilya Lavrenov
c8abb6124f recursive mutex for linux 2013-11-22 17:30:32 +04:00
Ilya Lavrenov
650f92f9cc eliminated warning C4267 2013-11-21 18:27:07 +04:00
Ilya Lavrenov
65b7e2018c fixed kernel compilation 2013-11-21 14:22:24 +04:00
Andrey Pavlenko
8d1a8df1a9 Merge pull request #1824 from vpisarev:ocl_experiments5 2013-11-20 19:14:40 +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
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
Roman Donchenko
56f791679b Merge pull request #1825 from jet47:fix-opengl-mem-leak 2013-11-19 12:31:53 +04:00
Vladislav Vinogradov
66221a32b9 fixed memory leak in ogl::Texture2D 2013-11-19 10:12:22 +04: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
Anatoly Baksheev
8f6f9c3e58 compilation for VS2008 2013-11-16 20:14:01 +04:00
Roman Donchenko
615d6c22d1 Switched OpenCV to a 3-component version number. 
Epoch is gone; now the version component names in C++ and CMake
are consistent (except REVISION corresponds to PATCH).
 2013-11-15 19:41:53 +04:00
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
 2013-11-11 16:55:36 +04:00
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.
 2013-11-07 17:22:02 +04:00
Ilya Lavrenov
2df53d97c5 added ocl::repeat 2013-11-05 12:23:20 +04:00
Alexander Smorkalov
f027cf80f7 OpenCV Version++. OpenCV Manager Version++. 2013-11-01 15:22:34 +04:00
Vadim Pisarevsky
485d36d3c0 changed InputArray's enumeration constant for UMat, since it may potentially conflict with existing OpenCL module. refactored Kernel's setArg API (now UMat is passed to a kernel as a structure, as Alexander A suggested). removed Kernel's cleanup callback from the external API; now each kernel keeps track of used matrices and they are dereferenced after it's complete. 2013-10-25 16:46:03 +04:00
Vadim Pisarevsky
6416c33020 fixed some bugs in OpenCL branch of UMat implementation; maybe now the tests will finally pass?! (please ;( ) 2013-10-25 11:19:40 +04:00
Vadim Pisarevsky
5920bd4f2e fixed whitespace errors 2013-10-24 23:18:05 +04:00
Vadim Pisarevsky
caa33b2242 added first very simple test for UMat<=>Mat conversion 2013-10-24 22:33:41 +04:00
Vadim Pisarevsky
b1aa4a4913 yet another attempt to fix test failures 2013-10-24 18:00:15 +04:00
Vadim Pisarevsky
a9065b7d0c trying to fix failures in tests 2013-10-24 17:23:48 +04:00
Vadim Pisarevsky
303df78cca removed refcount field from Mat; that helped to find and eliminate some memory leaks. perf tests should probably pass now 2013-10-24 16:08:15 +04:00
Vadim Pisarevsky
5a34272150 fixed build on Windows 2013-10-23 00:17:18 +04:00
Vadim Pisarevsky
de521fc9fa fixed some more compile bugs (including Python bindings) 2013-10-22 23:34:16 +04:00
Vadim Pisarevsky
d3076c5014 hopefully, fixed compile errors on Win & Linux; fixed getMatVector() so core & imgproc tests now pass; fixed doc builder errors 2013-10-22 17:41:28 +04:00
Vadim Pisarevsky
d8c8339bec the first draft of transparent API and new UMat class. more files 2013-10-22 14:05:15 +04:00
Vadim Pisarevsky
278fb617d2 the first draft of transparent API and new UMat class. 2013-10-22 14:04:49 +04:00
Roman Donchenko
29f37fc130 Merge pull request #1575 from jet47:gpu-buffer-pool 2013-10-21 16:35:14 +04:00
Roman Donchenko
21233656bd Merge pull request #1540 from jet47:gpuarithm-cudev 2013-10-21 16:34:45 +04:00
Roman Donchenko
578e984739 OpenCV 2.4.6.2 (Tegra detection and native camera update) 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.12 (GNU/Linux)
 
 iF4EABEIAAYFAlIxuvoACgkQdDiF7KIeJGrdaQEA0cMV6JhnsWSnZbRCd3RzyXD7
 8mf7qrSjIV9ty1UL9AMA/0d4iUIm/iEiBIEP0DbsshX+trN5kXsH5woriScbZMGS
 =WeoS
 -----END PGP SIGNATURE-----

Merge tag '2.4.6.2' into 2.4

OpenCV 2.4.6.2 (Tegra detection and native camera update)
 2013-10-17 17:19:04 +04:00
Alexander Alekhin
e845184843 Merge remote-tracking branch 'upstream/2.4' into merge-2.4 
* #1538 from StevenPuttemans:bugfix_3283
* #1545 from alalek:ocl_test_fix_rng
* #1551 from alalek:cmake_install_win
* #1570 from ilya-lavrenov:ipp_warn_fix
* #1573 from alalek:perf_simple_strategy
* #1574 from alalek:svm_workaround
* #1576 from alalek:ocl_fix_cl_double
* #1577 from ilya-lavrenov:ocl_setto_opencl12
* #1578 from asmorkalov:android_fd_cp_fix
* #1579 from ilya-lavrenov:ocl_norm
* #1582 from sperrholz:ocl-arithm-additions
* #1586 from ilya-lavrenov:ocl_setto_win_fix
* #1589 from ilya-lavrenov:pr1582_fix
* #1591 from alalek:ocl_remove_cl_hpp_h
* #1592 from alalek:ocl_program_cache_update
* #1593 from ilya-lavrenov:ocl_war_on_double
* #1594 from ilya-lavrenov:ocl_perf
* #1595 from alalek:cl_code_cleanup
* #1596 from alalek:test_fix_run_py
* #1597 from alalek:ocl_fix_cleanup
* #1598 from alalek:ocl_fix_build_mac
* #1599 from ilya-lavrenov:ocl_mac_kernel_warnings
* #1601 from ilya-lavrenov:ocl_fix_tvl1_and_sparse
* #1602 from alalek:ocl_test_dump_info
* #1603 from ilya-lavrenov:ocl_disable_svm_noblas
* #1605 from alalek:ocl_fixes
* #1606 from ilya-lavrenov:ocl_imgproc
* #1607 from ilya-lavrenov:ocl_fft_cleanup
* #1608 from alalek:fix_warn_upd_haar
* #1609 from ilya-lavrenov:ocl_some_optimization
* #1610 from alalek:ocl_fix_perf_kalman
* #1612 from alalek:ocl_fix_string_info
* #1614 from ilya-lavrenov:ocl_svm_misprint
* #1616 from ilya-lavrenov:ocl_cvtColor
* #1617 from ilya-lavrenov:ocl_info
* #1622 from a0byte:2.4
* #1625 from ilya-lavrenov:to_string

Conflicts:
	cmake/OpenCVConfig.cmake
	cmake/OpenCVDetectPython.cmake
	cmake/OpenCVGenConfig.cmake
	modules/core/CMakeLists.txt
	modules/nonfree/src/surf.ocl.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/include/opencv2/ocl/private/util.hpp
	modules/ocl/perf/main.cpp
	modules/ocl/src/arithm.cpp
	modules/ocl/src/cl_operations.cpp
	modules/ocl/src/cl_programcache.cpp
	modules/ocl/src/color.cpp
	modules/ocl/src/fft.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/src/gemm.cpp
	modules/ocl/src/haar.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/matrix_operations.cpp
	modules/ocl/src/pyrlk.cpp
	modules/ocl/src/split_merge.cpp
	modules/ocl/src/svm.cpp
	modules/ocl/test/main.cpp
	modules/ocl/test/test_fft.cpp
	modules/ocl/test/test_moments.cpp
	modules/ocl/test/test_objdetect.cpp
	modules/ocl/test/test_optflow.cpp
	modules/ocl/test/utility.hpp
	modules/python/CMakeLists.txt
	modules/ts/include/opencv2/ts.hpp
	modules/ts/src/ts_perf.cpp
	samples/android/face-detection/jni/DetectionBasedTracker_jni.cpp
 2013-10-15 20:08:52 +04:00
Han Qiang
88f68a3fe0 Fixed typo in document. 
Signed-off-by: Han Qiang <a0byte@gmail.com>
 2013-10-14 23:23:59 +08:00
Roman Donchenko
3f8db9d708 Merge pull request #1450 from adrians:neon-pull3 2013-10-14 15:08:37 +04:00
Ilya Lavrenov
1be77dd2f3 enabled accuracy tests for the functions that use inside AMD Blas/Fft 2013-10-11 00:37:52 +04:00
Adrian Stratulat
3561bc1bbc rename vBinOp64f to vBinOp64, minor fixups 2013-10-10 21:28:05 +03:00
Andrey Pavlenko
3b1c53fa8d Merge pull request #1551 from alalek:cmake_install_win 2013-10-10 18:20:35 +04:00
Adrian Stratulat
cb445d697c Refactor vectorized arithmetical operations 2013-10-10 15:52:48 +03:00
Ilya Lavrenov
9d1636daa6 catching OpenCL double not supported exceptions 2013-10-10 12:45:55 +04:00
Alexander Alekhin
555c505b70 update cmake 'install' target for Windows platform 
Allow to build samples via OpenCV binaries from distribution package
(find_package with OpenCV_DIR).
 2013-10-09 17:49:10 +04:00
Ilya Lavrenov
d57a7008f1 fixed cmd parser when arg is like -+ 2013-10-09 17:42:36 +04:00
Vladislav Vinogradov
342e007dc6 now Allocator accepts GpuMat* instead of 3 pointers 2013-10-08 17:21:25 +04:00
Vladislav Vinogradov
3b412b51ac moved BufferPool management functions to public 2013-10-08 17:21:22 +04:00
Vladislav Vinogradov
5ea8085220 added BufferPool class 2013-10-08 17:20:29 +04:00
Vladislav Vinogradov
988ab79acb added BufferAllocator 2013-10-08 17:20:20 +04:00
Roman Donchenko
895308a811 Merge pull request #1538 from StevenPuttemans:bugfix_3283 2013-10-08 13:00:39 +04:00
Vladislav Vinogradov
e5188c7e94 added GpuMat::Allocator interface 2013-10-07 09:42:43 +04:00
Ilya Lavrenov
036e99d03a fixed ipp-related warnings 2013-10-05 14:54:00 +04:00
StevenPuttemans
2f474db27f Fix of bug #3283 and bug #3301 
Added extra information for fitEllipse, minAreaRect and addapted ellipse &
ellipse2Poly parameter description.
 2013-10-04 11:19:45 +02:00
Roman Donchenko
81eb4bd8be Merge remote-tracking branch 'origin/2.4' 
Conflicts:
	doc/tutorials/features2d/feature_detection/feature_detection.rst
	modules/bioinspired/doc/retina/index.rst
	modules/core/include/opencv2/core/core.hpp
	modules/core/include/opencv2/core/mat.hpp
	modules/core/include/opencv2/core/operations.hpp
	modules/core/src/stat.cpp
	modules/features2d/include/opencv2/features2d/features2d.hpp
	modules/imgproc/src/filter.cpp
	modules/legacy/src/dpstereo.cpp
	modules/nonfree/src/surf.ocl.cpp
	modules/ocl/doc/image_processing.rst
	modules/ocl/doc/object_detection.rst
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/include/opencv2/ocl/private/util.hpp
	modules/ocl/src/arithm.cpp
	modules/ocl/src/canny.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/initialization.cpp
	modules/ocl/src/matrix_operations.cpp
	modules/ocl/src/pyrdown.cpp
	modules/ocl/src/pyrup.cpp
	modules/ocl/src/split_merge.cpp
	modules/ocl/test/test_objdetect.cpp
	modules/ocl/test/utility.hpp
 2013-10-01 15:57:33 +04:00
Vladislav Vinogradov
32d578f5f0 fixed gridTransform overloads problems 2013-10-01 12:18:35 +04:00
Roman Donchenko
a4b3aa9e1e Merge pull request #1477 from nzjrs:python-gethardwaresupport 2013-09-30 17:44:45 +04:00
Alexander Smorkalov
0d49206a98 Merge pull request #1485 from vpisarev:ipp_fixes 2013-09-26 11:09:59 +04:00
shawke
720241de87 Make similar default typedefs for Point_, Size_ and Rect_ 
Currently, there are different default typedefs for Point_, Size_, and Rect_. This pull request at least makes sure that default typedefs exist for int, float and double variants of each of these types.
 2013-09-24 11:48:04 +02:00
Alexander Smorkalov
298a1d50d2 Merge pull request #1299 from jet47:gpu-cuda-rename 2013-09-23 10:31:51 +04:00
John Stowers
14d225134d Redefine CPU_xx constants in cv::namespace 
This makes them visible from the python bindings
 2013-09-20 20:04:33 +02:00
Vadim Pisarevsky
8e7eb79f6e fixed compile errors and warnings when building master branch with IPP enabled 2013-09-20 16:02:15 +04:00
Alexander Alekhin
f1b5cbc8fe ocl: fix invalid usage of alignSize (n is not a power of 2), added roundUp 2013-09-18 01:14:41 +04:00
Alexander Alekhin
0ee47502d9 remove CV_EXPORT from templates 2013-09-15 13:48:54 +04:00
Roman Donchenko
d669559ec3 Bumped version to 3.0. 2013-09-12 16:40:14 +04:00
Roman Donchenko
887825e831 Added an additional version component - the development status. 
This will allow us to distinguish between regular releases, prereleases
and development versions.
 2013-09-12 16:20:09 +04:00
Roman Donchenko
dee2a65978 Merge pull request #1440 from SpecLad:wcast-align 2013-09-12 13:56:23 +04:00
Roman Donchenko
fec697b390 Silenced a few -Wcast-align warnings in the headers. 
We don't use -Wcast-align ourselves, but the headers trigger warnings
for those users who do, which is not nice.
 2013-09-12 12:33:56 +04:00
Vadim Pisarevsky
61f2107829 added IPP optimization of separable 32f filters; fixed IPP version check in DFT; fixed conditions in IPP optimization of norm functions. 2013-09-09 16:13:39 +04:00
Vladislav Vinogradov
1036ce807c Merge branch 'master' into gpu-cuda-rename 
Conflicts:
	modules/core/include/opencv2/core/cuda.hpp
	modules/cudaimgproc/src/gftt.cpp
	modules/objdetect/include/opencv2/objdetect/erfilter.hpp
	modules/objdetect/src/erfilter.cpp
	modules/superres/perf/perf_superres.cpp
	modules/superres/src/btv_l1_cuda.cpp
	modules/superres/src/optical_flow.cpp
	modules/videostab/src/global_motion.cpp
	modules/videostab/src/inpainting.cpp
	samples/cpp/stitching_detailed.cpp
	samples/cpp/videostab.cpp
	samples/gpu/stereo_multi.cpp
 2013-09-09 12:57:35 +04:00
Vladislav Vinogradov
a0771630b0 restored original behaviour or release functions for (Buffer and Texture) 2013-09-09 10:57:45 +04:00
Vladislav Vinogradov
b7eff94137 fixed compilation issues with new Ptr 2013-09-06 15:52:07 +04:00
Vladislav Vinogradov
0c7663eb3b Merge branch 'master' into gpu-cuda-rename 
Conflicts:
	modules/core/include/opencv2/core/cuda.hpp
	modules/cudacodec/src/thread.cpp
	modules/cudacodec/src/thread.hpp
	modules/superres/perf/perf_superres.cpp
	modules/superres/src/btv_l1_cuda.cpp
	modules/superres/src/optical_flow.cpp
	modules/videostab/src/global_motion.cpp
	modules/videostab/src/inpainting.cpp
	samples/cpp/stitching_detailed.cpp
	samples/cpp/videostab.cpp
	samples/gpu/stereo_multi.cpp
 2013-09-06 15:44:44 +04:00
Roman Donchenko
86b841563b Added tests for Ptr. 2013-09-05 19:03:00 +04:00
Roman Donchenko
a97ffe6513 Rewrote the documentation for Ptr to fit the new implementation. 2013-09-05 19:03:00 +04:00
Roman Donchenko
a50d75d362 Made Filestorage able to not own its CvFileStorage instance. 
This allows to get rid of the last remaining Ptr<T>::addref calls.
 2013-09-05 19:03:00 +04:00
Roman Donchenko
3e189a2b41 Replaced calls to Ptr<T>::ptr to ::dynamicCast. 2013-09-05 19:03:00 +04:00
Roman Donchenko
24dee16b12 Added to CV_INIT_ALGORITHM a Ptr creation function, for convenience. 
Also changed the static functions to inline, to stop GCC complaining
about unused functions.
 2013-09-05 19:03:00 +04:00
Roman Donchenko
8200a95ced Boring changes - core. 
This and several following commits contain the "boring" changes required
to support the new Ptr. These are changes like:

* new T -> makePtr<T> or .reset(new T) or Ptr<T>(new T)
  (depending on the situation)
* p.empty() -> !p
* delete_obj -> DefaultDeleter::operator()

and similar changes that are numerous, but primitive.
 2013-09-05 18:26:43 +04:00
Roman Donchenko
461c98fa86 Replaced Ptr with my new implementation. 2013-09-05 14:54:20 +04:00
Roman Donchenko
fd3b2326b4 Merge pull request #1373 from abidrahmank:pykeypoints 2013-09-04 11:53:33 +04:00
Vladislav Vinogradov
1ad4592bfc Merge branch 'master' into gpu-cuda-rename 
Conflicts:
	modules/cudaoptflow/perf/perf_optflow.cpp
	modules/cudaoptflow/src/tvl1flow.cpp
	samples/gpu/stereo_multi.cpp
 2013-09-04 09:58:32 +04:00
Roman Donchenko
009919872f Merge pull request #1389 from SpecLad:merge-2.4 2013-09-03 19:42:06 +04:00
Abid K
0902f183ca alignment of parameters as per speclad 2013-09-03 21:12:03 +05:30
Roman Donchenko
79457f8f49 Merge pull request #1224 from mbarnach:pca_io 2013-09-03 18:43:54 +04:00
Roman Donchenko
9218f4976c Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	modules/contrib/src/retina.cpp
	modules/gpu/perf/perf_video.cpp
	modules/gpuoptflow/src/tvl1flow.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/perf_calib3d.cpp
	modules/ocl/perf/perf_color.cpp
	modules/ocl/perf/perf_match_template.cpp
	modules/ocl/src/precomp.hpp
	samples/gpu/stereo_multi.cpp
 2013-09-02 19:44:51 +04:00
Roman Donchenko
99043f6fc2 Merge pull request #1385 from asmorkalov:winrt_glob_fix 2013-09-02 16:05:15 +04:00
Alexander Smorkalov
6d3102141c Globbing accuracy test fail on Windows RT fixed. 2013-09-02 04:31:58 -07:00
Roman Donchenko
188d3f02ee Merge pull request #1302 from kdrobnyh:compare 2013-09-02 15:11:20 +04:00
Vladislav Vinogradov
ba4bf04c6c fixed incorrect GPUs -> CUDAs replacement 2013-09-02 14:00:44 +04:00
Vladislav Vinogradov
cbe437571e fixed docs 2013-09-02 14:00:44 +04:00
Vladislav Vinogradov
fd88654b45 replaced GPU -> CUDA 2013-09-02 14:00:44 +04:00
Vladislav Vinogradov
cfe4a71dc6 renamed gpu* source to cuda* in core module 2013-09-02 14:00:42 +04:00
Vladislav Vinogradov
8282f6ebc1 renamed gpu::cudev namespace -> cuda::device 
cudev is used for new device layer
 2013-09-02 14:00:41 +04:00
Vladislav Vinogradov
e895b7455e renamed gpu namespace -> cuda 2013-09-02 14:00:41 +04:00
Roman Donchenko
46d74d7c6b Merge pull request #1360 from vpisarev:24_ipp_dft_canny_morphrect 2013-08-30 17:55:07 +04:00
abidrahmank
7fd8a19fe8 warning corrections 2013-08-30 15:58:10 +05:30
abidrahmank
14af369640 Python bindings for KeyPoint methods 
Usage:

import numpy as np
import cv2
img = cv2.imread('messi5.jpg',0)
sift = cv2.SIFT()
kp = sift.detect(img)

pts = cv2.KeyPoint_convert(kp)

kps = cv2.KeyPoint_convert(pts.reshape(-1,1,2))

overlap = cv2.KeyPoint_overlap(kp[0],kp[1])
 2013-08-30 11:11:06 +05:30
kdrobnyh
f4aa7ff919 Add IPP support in meanStdDev, minMaxIdx, norm functions 2013-08-29 21:09:19 +04:00
Alexander Smorkalov
114e04ee12 OpenCV version++. Current OpenCv version 2.4.6.2 2013-08-29 19:00:13 +04:00
kdrobnyh
7a7aa148d4 Add IPP support in compare function 2013-08-29 17:55:57 +04:00
Roman Donchenko
fc37df05ec Merge pull request #1366 from asmorkalov:ocv_autobuffer_fix 2013-08-29 16:35:38 +04:00
Alexander Smorkalov
5af2cc6223 AutoBuffer with initial zero size fixed. 2013-08-29 15:03:53 +04:00
Vadim Pisarevsky
771feb61c2 fixed building OpenCV with IPP 6.x (different DFT API); added Canny and rectangular morphology (based on Alex Kapustin patches) 2013-08-28 17:00:26 +04:00
Roman Donchenko
2d6f35d6ed Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	modules/gpuwarping/src/cuda/resize.cu
	modules/gpuwarping/src/resize.cpp
	modules/gpuwarping/test/test_resize.cpp
	modules/ocl/perf/main.cpp
	modules/ocl/perf/perf_calib3d.cpp
	modules/ocl/perf/perf_canny.cpp
	modules/ocl/perf/perf_color.cpp
	modules/ocl/perf/perf_haar.cpp
	modules/ocl/perf/perf_match_template.cpp
	modules/ocl/perf/perf_precomp.cpp
	modules/ocl/perf/perf_precomp.hpp
 2013-08-27 19:15:47 +04:00
Roman Donchenko
9ed475cf52 War on Whitespace, master edition: file endings. 2013-08-27 14:23:26 +04:00
Roman Donchenko
2c4bbb313c Merge commit '43aec5ad' into merge-2.4 
Conflicts:
	cmake/OpenCVConfig.cmake
	cmake/OpenCVLegacyOptions.cmake
	modules/contrib/src/retina.cpp
	modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
	modules/gpu/doc/video.rst
	modules/gpu/src/speckle_filtering.cpp
	modules/python/src2/cv2.cv.hpp
	modules/python/test/test2.py
	samples/python/watershed.py
 2013-08-27 13:26:44 +04:00
Roman Donchenko
4d06c4c7b6 Merge commit '43aec5ad^' into merge-2.4 
Conflicts:
	modules/contrib/src/inputoutput.cpp
	modules/gpu/perf/perf_imgproc.cpp
	modules/gpuarithm/perf/perf_element_operations.cpp
	modules/gpuarithm/src/element_operations.cpp
	modules/ts/src/precomp.hpp
 2013-08-27 13:23:26 +04:00
Roman Donchenko
3182e68b8a Merge pull request #1334 from MarkBelmont:bugfix_1 2013-08-23 16:49:51 +04:00
Roman Donchenko
cae4480834 Merge pull request #1332 from pengx17:2.4_fix_parallel 2013-08-23 14:47:49 +04:00
MarkBelmont
cf34b3d65b Changed the brief description of function Mat::colRange from "Create a matrix header for the specified row span." to "Create a matrix header for the specified column span." 2013-08-23 16:39:39 +08:00
peng xiao
2519a21935 Fix a potential bug of ParallelLoopBodyWrapper::operator(Range) 
On a 32-bit compiler the calculation may result in data (size_t) overflow when running some paralleled algorithms (which can safely run on a 64-bit compiler).
This bug is found when running OpenCV's Retina tutorial on 32bit VS2010.
 2013-08-23 15:35:55 +08:00
Roman Donchenko
6fed0e85c2 Cut down on the use of ZLIB_LIBRARY/ZLIB_INCLUDE_DIR. 
They're not listed in the documentation for the FindZLIB module,
so we shouldn't use them unless necessary.
 2013-08-22 18:17:19 +04:00
Roman Donchenko
43aec5ad4a Merge pull request #1318 from SpecLad:wow 2013-08-22 11:49:45 +04:00
Roman Donchenko
9c60a2c24c Merge pull request #1316 from asmorkalov:winrt_c4447_fix 2013-08-21 19:24:25 +04:00
Roman Donchenko
3c137f7a04 Converted tabs to spaces. 2013-08-21 18:59:26 +04:00
Roman Donchenko
e9a28f66ee Normalized file endings. 2013-08-21 18:59:25 +04:00
Roman Donchenko
f55740da70 Deleted all trailing whitespace. 2013-08-21 18:59:24 +04:00
Alexander Smorkalov
b15addec70 C4447 warning about main function format suppressed. 2013-08-21 07:24:46 -07:00
Alexander Smorkalov
d62c98527a Invalid usage of cv::Ptr for arrays fixed. 2013-08-21 07:20:35 -07:00
Roman Donchenko
beada19ad0 Merge pull request #1297 from SpecLad:merge-2.4 2013-08-20 14:10:22 +04:00
Roman Donchenko
f76dd99299 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	cmake/OpenCVModule.cmake
	doc/tutorials/calib3d/camera_calibration/camera_calibration.rst
	doc/tutorials/features2d/feature_detection/feature_detection.rst
	doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.rst
	doc/tutorials/features2d/feature_homography/feature_homography.rst
	modules/core/include/opencv2/core/operations.hpp
	modules/core/src/arithm.cpp
	modules/gpu/perf/perf_video.cpp
	modules/imgproc/include/opencv2/imgproc/imgproc.hpp
	modules/java/generator/gen_java.py
	modules/java/generator/src/cpp/VideoCapture.cpp
	modules/nonfree/src/opencl/surf.cl
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/perf_haar.cpp
	modules/ocl/perf/perf_precomp.hpp
	modules/ocl/src/color.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/test/test_color.cpp
	modules/ocl/test/test_objdetect.cpp
	modules/python/src2/cv2.cpp
	samples/gpu/CMakeLists.txt
	samples/gpu/super_resolution.cpp
 2013-08-19 19:02:36 +04:00