Hamdi Sahloul [Fri, 10 Mar 2017 13:09:31 +0000 (22:09 +0900)]
Accept default argument of FLANN index parameters
Hamdi Sahloul [Tue, 21 Feb 2017 02:29:28 +0000 (11:29 +0900)]
cv::Matx python wrapper
Alexander Alekhin [Sun, 19 Feb 2017 10:15:59 +0000 (10:15 +0000)]
Merge pull request #8221 from csukuangfj:csukuangfj-path-2
LaurentBerger [Sun, 19 Feb 2017 10:15:58 +0000 (11:15 +0100)]
Merge pull request #8220 from LaurentBerger:Issue5035
Fangjun KUANG [Sat, 18 Feb 2017 09:14:29 +0000 (10:14 +0100)]
Fix an error in the demo code for cv::Mat::forEach
Vadim Pisarevsky [Thu, 16 Feb 2017 15:01:49 +0000 (15:01 +0000)]
Merge pull request #8178 from tomoaki0705:addBayer2RGBA
Vadim Pisarevsky [Thu, 16 Feb 2017 15:00:58 +0000 (15:00 +0000)]
Merge pull request #8187 from hewj03:improve-MultiBandBlender-cuda
Fangjun KUANG [Thu, 16 Feb 2017 15:00:32 +0000 (16:00 +0100)]
Fix the documentation for Mat::diag(int). (#8199)
* Fix the documentation for Mat::diag(int).
Fix issue #8181
* Fix the documentation for Mat::diag(int).
Fix issue #8181.
* Add support for printing out cv::Complex.
* Remove extra spaces.
* cv::Complex is submitted as a new pull request.
Vadim Pisarevsky [Thu, 16 Feb 2017 14:58:25 +0000 (14:58 +0000)]
Merge pull request #8203 from alalek:ocl_kernelarg_validate
Alexander Alekhin [Thu, 16 Feb 2017 11:08:59 +0000 (11:08 +0000)]
Merge pull request #8214 from jinay1991:patch-1
Jinay Patel [Thu, 16 Feb 2017 09:50:57 +0000 (15:20 +0530)]
Update ocl.cpp function Device::OpenCLVersion()
Instead of CL_DEVICE_EXTENSIONS in Querying OpenCLVersion, it should be CL_DEVICE_VERSION flag which needs to be passed to the function.
Alexander Alekhin [Thu, 16 Feb 2017 08:57:44 +0000 (08:57 +0000)]
Merge pull request #8211 from csukuangfj:csukuangfj-patch-3
Alexander Alekhin [Thu, 16 Feb 2017 08:56:02 +0000 (08:56 +0000)]
Merge pull request #8210 from alalek:fix_mkl_link
Vadim Pisarevsky [Wed, 15 Feb 2017 20:22:57 +0000 (20:22 +0000)]
Merge pull request #8131 from atinfinity:170205-add_dense_flow_sample
Vadim Pisarevsky [Wed, 15 Feb 2017 20:17:39 +0000 (20:17 +0000)]
Merge pull request #8153 from Sejsel:patch-1
Fangjun KUANG [Wed, 15 Feb 2017 18:50:14 +0000 (19:50 +0100)]
Merge pull request #8208 from csukuangfj:complex_support
Add support for printing out cv::Complex. (#8208)
* Add support for printing out cv::Complex.
* Conform to the format of std::complex.
* Remove extra spaces.
* Remove extra spaces.
Alexander Alekhin [Wed, 15 Feb 2017 18:48:01 +0000 (18:48 +0000)]
Merge pull request #8209 from csukuangfj:csukuangfj-patch-2
Fangjun KUANG [Wed, 15 Feb 2017 15:44:40 +0000 (16:44 +0100)]
Change the argument type to cl_platform_info.
Although both `cl_platform_info` and `cl_device_info` are defined as macro `cl_uint`, it needs to use `cl_platform_info` to get
the platform information.
Alexander Alekhin [Wed, 15 Feb 2017 15:35:16 +0000 (15:35 +0000)]
Merge pull request #8206 from paroj:cast
Alexander Alekhin [Wed, 15 Feb 2017 14:12:28 +0000 (17:12 +0300)]
cmake: fix order of MKL libraries, don't pass additional libraries as modules
Fangjun KUANG [Wed, 15 Feb 2017 13:52:00 +0000 (14:52 +0100)]
Fix typos.
Pavel Rojtberg [Wed, 15 Feb 2017 11:18:35 +0000 (12:18 +0100)]
add missing casts to _Tp as determinant() always returns double
Alexander Alekhin [Tue, 14 Feb 2017 11:58:52 +0000 (14:58 +0300)]
ocl: validate arguments in KernelArgs constructor
- don't use undefined flag=0. It should be CONSTANT instead.
- don't allow 'UMat* m=NULL' argument (except LOCAL/CONSTANT flags).
This case is not handled well to provide NULL __global pointers.
It is better to use '-D' macro defines instead (at least for performance)
Alexander Alekhin [Tue, 14 Feb 2017 13:03:09 +0000 (13:03 +0000)]
Merge pull request #8160 from ilijapuaca:master
Alexander Alekhin [Mon, 13 Feb 2017 10:59:59 +0000 (10:59 +0000)]
Merge pull request #8186 from Kronopath:patch-1
Alexander Alekhin [Mon, 13 Feb 2017 10:59:30 +0000 (10:59 +0000)]
Merge pull request #8176 from alalek:cmake_cleanup_msvc_checks
Alexander Alekhin [Mon, 13 Feb 2017 10:59:09 +0000 (10:59 +0000)]
Merge pull request #8175 from alalek:cmake_cleanup_defines
Fangjun KUANG [Mon, 13 Feb 2017 10:58:44 +0000 (11:58 +0100)]
Merge pull request #8197 from csukuangfj/csukuangfj-patch-1
Fix typos in the documentation for AutoBuffer. (#8197)
* Allocate 1000 floats to match the documentation
Fix the documentation of `AutoBuffer`. By default, the following code
```.cpp
cv::AutoBuffer<float> m;
````
allocates only 264 floats. But the comment in the demonstration code says it allocates 1000 floats, which is
not correct.
* fix typo in the comment.
atinfinity [Sun, 12 Feb 2017 15:53:35 +0000 (00:53 +0900)]
refactoring
atinfinity [Sun, 12 Feb 2017 15:35:52 +0000 (00:35 +0900)]
refactoring
atinfinity [Sun, 12 Feb 2017 15:26:48 +0000 (00:26 +0900)]
fixed indent
atinfinity [Sun, 12 Feb 2017 14:33:57 +0000 (23:33 +0900)]
added option to specify flow type
Wenju He [Sun, 12 Feb 2017 09:16:49 +0000 (17:16 +0800)]
add accuracy test CUDA_MultiBandBlender
Wenju He [Sun, 12 Feb 2017 09:08:05 +0000 (17:08 +0800)]
improve MultiBandBlender cuda, add normalizeUsingWeight and addSrcWeight kernels
Gabriel B. Nunes [Sun, 12 Feb 2017 01:40:37 +0000 (20:40 -0500)]
Work around CMake bug that mangles install dir
CMake has a long-standing bug/feature (see [here](https://cmake.org/pipermail/cmake/2015-March/060204.html) and reply [here](https://cmake.org/pipermail/cmake/2015-March/060209.html)) which can mangle certain path variables by attempting to make them into relative paths if you try to set them with CACHE PATH.
Say you have your OpenCV download at `/path/on/my/computer/to/opencv/`. What actually happens is that if you try to set this variable by invoking CMAKE with `-DCMAKE_INSTALL_PREFIX=/my/desired/install/path`, what you end up is *not* `/usr/local/` and *not* `my/desired/install/path`, but instead, this monstrosity: `/path/on/my/computer/to/opencv/src/OpenCV-build//my/desired/install/path`.
That is, CMake attempts, for some reason, to turn the path that you passed into a path relative to `${CMAKE_BINARY_DIR}`. See the links I posted above: this is a known (and apparently unfixable) issue with CMake.
In OpenCV's case, among other potential issues, this leads to broken paths in `opencv_tests_config.hpp`, which can break the build or cause bizarre behaviour.
The fix for this issue, as stated in my links above, is to test that the variable hasn't been set yet with an `if(NOT DEFINED ...)` before attempting to set it. This is what I've implemented here. I admit I don't know enough about OpenCV's internals to know whether you *really* need to force the install to be in `/usr/local`, but as it stands right now you get *neither* a clean `/usr/local` path *nor* a customized `/my/desired/install/path`, but a broken mess. This change at least allows the user to customize their install directory.
In the meantime, there's a workaround for this, by explicitly defining the variable as a path with `-DCMAKE_INSTALL_PREFIX:PATH=my/desired/install/path`. But if this change can save anyone else the hours of headaches that I had today, I'll be happy.
Alexander Alekhin [Sat, 11 Feb 2017 11:02:10 +0000 (11:02 +0000)]
Merge pull request #8165 from AdeelH:master
Tomoaki Teshima [Fri, 10 Feb 2017 15:20:57 +0000 (00:20 +0900)]
add enum Bayer**2BGRA
- let it possible to reach Bayer2BGRA conversion
Alexander Alekhin [Fri, 10 Feb 2017 12:28:50 +0000 (15:28 +0300)]
cmake: cleanup MSVC checks
Alexander Alekhin [Fri, 10 Feb 2017 12:18:29 +0000 (15:18 +0300)]
cmake: cleanup unused defines
cclauss [Fri, 10 Feb 2017 12:12:11 +0000 (13:12 +0100)]
Merge pull request #8150 from cclauss/patch-1
cv2.findContours() no longer modifies source image (#8150)
* cv2.findContours() no longer modifies source image
Since OpenCV 3.2, cv2.findContours() no longer modifies the source image but returns a modified image as the first of three return parameters. ??? Do I have that correct ???
Also fixed up the code blocks to be valid markdown.
* ```python --> @code{.py}
Enables syntax highlighting in docs.
Ilija Puaca [Thu, 9 Feb 2017 10:45:12 +0000 (11:45 +0100)]
Updated version of libwebp to 0.6.0. Removed iOS from build exceptions for libwebp
Alexander Alekhin [Thu, 9 Feb 2017 15:52:38 +0000 (15:52 +0000)]
Merge pull request #8159 from alalek:fix_8158
Adeel [Thu, 9 Feb 2017 15:11:00 +0000 (20:11 +0500)]
update fix for #8105 (compiling with mingw32)
taken from https://github.com/google/googletest/pull/856
Alexander Alekhin [Thu, 9 Feb 2017 10:23:35 +0000 (13:23 +0300)]
core: fix String::end() implementation
Jiří Sejkora [Thu, 9 Feb 2017 01:07:06 +0000 (02:07 +0100)]
Fixed two typos in the Filter2D tutorial
Vadim Pisarevsky [Wed, 8 Feb 2017 13:57:36 +0000 (13:57 +0000)]
Merge pull request #8134 from chrizandr:doc_typo
Vadim Pisarevsky [Wed, 8 Feb 2017 13:30:15 +0000 (13:30 +0000)]
Merge pull request #7904 from paroj:initmapfc2
Vadim Pisarevsky [Wed, 8 Feb 2017 13:29:31 +0000 (13:29 +0000)]
Merge pull request #7910 from StevenPuttemans:add_visapp2017_contribution
Alexander Alekhin [Wed, 8 Feb 2017 11:29:34 +0000 (11:29 +0000)]
Merge pull request #8140 from StevenPuttemans:fix_gdal_driver_4channel_16bit
StevenPuttemans [Tue, 7 Feb 2017 10:37:42 +0000 (11:37 +0100)]
enable processing of 16, 32 and 64 bit 4 channel data using GDAL1.2
Alexander Alekhin [Tue, 7 Feb 2017 12:53:18 +0000 (12:53 +0000)]
Merge pull request #8125 from terfendail:ovxhal_integral_fix
Alexander Alekhin [Tue, 7 Feb 2017 12:12:53 +0000 (15:12 +0300)]
Merge pull request #8137 from LaurentBerger:thresholdDoc
Solve issue 8136 opencv doc of threshold
LaurentBerger [Tue, 7 Feb 2017 09:14:24 +0000 (10:14 +0100)]
Add note about OTSU and TRIANGLE (comment sovrasov)
LaurentBerger [Mon, 6 Feb 2017 21:49:18 +0000 (22:49 +0100)]
Solve issue 8136 opencv doc of threshold
Alexander Alekhin [Mon, 6 Feb 2017 10:36:06 +0000 (10:36 +0000)]
Merge pull request #8133 from StevenPuttemans:add_detectMultiScale_notice
chrizandr [Mon, 6 Feb 2017 10:35:48 +0000 (16:05 +0530)]
Corrected typo in py_histogram_begins tutorial
Alexander Alekhin [Mon, 6 Feb 2017 10:35:27 +0000 (10:35 +0000)]
Merge pull request #8132 from tonytheodore:highgui-gl
Alexander Alekhin [Mon, 6 Feb 2017 10:34:12 +0000 (10:34 +0000)]
Merge pull request #8128 from LaurentBerger:MatrixExpressions
Add a link to MatExpr in Detailed Description of Mat
Alexander Alekhin [Mon, 6 Feb 2017 10:32:22 +0000 (10:32 +0000)]
Merge pull request #8123 from msk-repo01:master
Alexander Alekhin [Mon, 6 Feb 2017 10:31:34 +0000 (10:31 +0000)]
Merge pull request #8107 from reunanen:fix8093
StevenPuttemans [Mon, 6 Feb 2017 09:38:03 +0000 (10:38 +0100)]
add explanation to detectMultiScale overload functionality
Tony Theodore [Sun, 5 Feb 2017 17:15:10 +0000 (04:15 +1100)]
highgui: use forward slash for gl.h include
The backslash causes build failure when cross-compiling with mingw-w64
atinfinity [Sun, 5 Feb 2017 13:10:37 +0000 (22:10 +0900)]
added dense flow sample
LaurentBerger [Sat, 4 Feb 2017 10:10:50 +0000 (11:10 +0100)]
Add a link to MatExpr in Detailed Description of Mat
Vitaly Tuzov [Fri, 3 Feb 2017 10:54:22 +0000 (13:54 +0300)]
Fixed addressing structure population for integral image output
Alexander Alekhin [Fri, 3 Feb 2017 08:47:37 +0000 (08:47 +0000)]
Merge pull request #8084 from mshabunin:libstdcplusplus-debug
msk-repo01 [Thu, 2 Feb 2017 21:47:09 +0000 (13:47 -0800)]
Fix for opencv/opencv#8105 (compiling with mingw32)
fix for opencv/opencv#8105, compilation issue with mingw32 (in
google/googletest#721 a similar issue was solved and the reason was
described as MinGW defines _CRITICAL_SECTION and _RTL_CRITICAL_SECTION
as two separate (equivalent) structs, instead of using typedef)
PkLab [Wed, 1 Feb 2017 14:37:24 +0000 (15:37 +0100)]
Merge pull request #8112 from PkLab:Fix_7898
CoInitialize/CoUninitialize in VFW classes (#8112)
Alexander Alekhin [Wed, 1 Feb 2017 09:46:59 +0000 (09:46 +0000)]
Merge pull request #8114 from lupustr3:pvlasov/ipp_python_export
Pavel Vlasov [Wed, 1 Feb 2017 07:29:35 +0000 (10:29 +0300)]
Adds IPP control functions to bindings export
Alexander Alekhin [Tue, 31 Jan 2017 18:46:54 +0000 (18:46 +0000)]
Merge pull request #8078 from tomoaki0705:universalIntrinsicLapack
Alexander Alekhin [Tue, 31 Jan 2017 16:10:09 +0000 (16:10 +0000)]
Merge pull request #8109 from lupustr3:pvlasov/ipp_build_fix
Pavel Vlasov [Tue, 31 Jan 2017 13:39:09 +0000 (16:39 +0300)]
Fixes IPP build on linux;
Juha Reunanen [Sun, 29 Jan 2017 15:32:40 +0000 (17:32 +0200)]
Fix #8093: CV_DbgAssert that the result of area() fits in the return value
Vadim Pisarevsky [Tue, 31 Jan 2017 12:19:46 +0000 (12:19 +0000)]
Merge pull request #8081 from mshabunin:fix-kmeans-compactness
Maksim Shabunin [Tue, 31 Jan 2017 09:36:26 +0000 (12:36 +0300)]
Enable GNU STL debug mode for debug builds
Maksim Shabunin [Tue, 31 Jan 2017 09:13:53 +0000 (09:13 +0000)]
Merge pull request #8077 from sovrasov:mog2_docs_update
Maksim Shabunin [Tue, 31 Jan 2017 09:10:37 +0000 (09:10 +0000)]
Merge pull request #8103 from sovrasov:em_docs_update
Maksim Shabunin [Tue, 31 Jan 2017 09:05:08 +0000 (12:05 +0300)]
KMeans improvement
- fixed returned compactness value
- added centers drawing to the example app
- added compactness test
Tomoaki Teshima [Mon, 30 Jan 2017 20:36:27 +0000 (05:36 +0900)]
use universal intrinsic in VBLAS
- brush up v_reduce_sum of SSE version
Vladislav Sovrasov [Mon, 30 Jan 2017 14:11:19 +0000 (17:11 +0300)]
ml::EM: add documentation for predict() method
Alexander Alekhin [Mon, 30 Jan 2017 14:25:23 +0000 (17:25 +0300)]
Merge pull request #8098 from chrizandr:Tree_load_Wrapper
Add wrappers for load functions for DTrees and Boost classifiers
Alexander Alekhin [Mon, 30 Jan 2017 14:05:03 +0000 (14:05 +0000)]
Merge pull request #8082 from PkLab:fix_videoio_doc
Alexander Alekhin [Mon, 30 Jan 2017 13:53:50 +0000 (16:53 +0300)]
Merge pull request #8089 from hrnr:estimate_convert_fix
fix wrong conversion in estimateAffine2D* functions
Alexander Alekhin [Mon, 30 Jan 2017 13:52:31 +0000 (16:52 +0300)]
Merge pull request #8099 from chrizandr:ML_Wrappers
Wrappers for load methods of EM, LR, SVMSGD and Normal Bayes Classifier
Alexander Alekhin [Mon, 30 Jan 2017 13:51:40 +0000 (13:51 +0000)]
Merge pull request #8088 from paroj:vtkfix
chrizandr [Sun, 29 Jan 2017 13:21:55 +0000 (18:51 +0530)]
Wrappers for load methods of EM, LR, SVMSGD and Normal Bayes Classifier
chrizandr [Sun, 29 Jan 2017 10:13:01 +0000 (15:43 +0530)]
Add wrappers for load functions for DTrees and Boost classifiers
Alexander Alekhin [Sat, 28 Jan 2017 11:40:04 +0000 (11:40 +0000)]
Merge pull request #8085 from tomoaki0705:checkSse2
Jiri Horner [Fri, 27 Jan 2017 16:52:35 +0000 (17:52 +0100)]
add test for convertions in estimateAffine2D* functions
test with integer points to cover conversion bugs.
Jiri Horner [Fri, 27 Jan 2017 15:55:29 +0000 (16:55 +0100)]
fix conversion bug in estimateAffine2D* functions
functions support points to have other datatypes than floats.
* fix bug in coversion that overwrites src points with dst points
Pavel Rojtberg [Fri, 27 Jan 2017 14:51:19 +0000 (15:51 +0100)]
viz: fix compilation - we need the VTK includes before ocv_define_module
Tomoaki Teshima [Fri, 27 Jan 2017 09:42:58 +0000 (18:42 +0900)]
check correct flag
Alexander Alekhin [Thu, 26 Jan 2017 18:14:28 +0000 (18:14 +0000)]
Merge pull request #8080 from alalek:fix_8079
PkLab.net [Thu, 26 Jan 2017 16:10:32 +0000 (17:10 +0100)]
Fix misplaced description CAP_PROP_SETTINGS and others minor changes in videoio doc
Alexander Alekhin [Thu, 26 Jan 2017 15:15:18 +0000 (18:15 +0300)]
build: workaround for missing _mm256_setr_m128 in GCC
Alexander Alekhin [Thu, 26 Jan 2017 12:57:14 +0000 (12:57 +0000)]
Merge pull request #8076 from tomoaki0705:brushupAvxPopcount
Vladislav Sovrasov [Thu, 26 Jan 2017 09:43:41 +0000 (12:43 +0300)]
Clarify docs for MOG2::apply
Tomoaki Teshima [Thu, 26 Jan 2017 09:37:56 +0000 (18:37 +0900)]
brush up AVX optimization in popcount
- make sure SIMD optimization works even when AVX is not available
Alexander Alekhin [Thu, 26 Jan 2017 08:56:21 +0000 (08:56 +0000)]
Merge pull request #8074 from alalek:fix_java_tests