mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-28 21:20:18 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
21,045 Commits 6 Branches 126 Tags 3 GiB
a2af1d4f71
Commit Graph

21045 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexander Alekhin
eee638fd81 Merge pull request #8244 from sovrasov:adjust_roi_fix 2017-02-24 11:18:35 +00:00
Alexander Alekhin
c624d82383 Merge pull request #8239 from tomoaki0705:buildUniversalIntrinsicBlend 2017-02-24 11:17:51 +00:00
Alexander Alekhin
0c00242f7a Merge pull request #8235 from berak:fix_dshow_leak 2017-02-24 11:11:20 +00:00
Vadim Pisarevsky
12d7429ff0 Merge pull request #8064 from terfendail:sgbm_bigbuffer 2017-02-23 20:11:26 +00:00
Tomoaki Teshima
822c67fdee remove non ASCII character from comment 2017-02-24 01:31:32 +09:00
vskarlsruhe
56cedfc4d2 Update AddingImages.cpp 
If-condition was always true (alpha = 0.5 is set in Line 19).
Now the user input is checked to be between 0 and 1.
This is correct in the tutorial code for OpenCV 2.4.
 2017-02-23 11:43:30 +01:00
PkLab.net
e03c81d90a Change image e small fix to cv::ellipse() Doc 2017-02-23 09:10:48 +01:00
Tomoaki Teshima
aec59aba34 suppress warnings 
- brush up the implementation
 2017-02-23 09:11:12 +09:00
oulenz
28cfb07445 FLANN_INDEX_KDTREE = 0 -> 1 
0 corresponds to FLANN_INDEX_LINEAR
 2017-02-22 19:13:34 +01:00
oulenz
9cb13435a1 FLANN_INDEX_KDTREE = 0 -> 1 
0 corresponds to FLANN_INDEX_LINEAR
 2017-02-22 19:10:33 +01:00
oulenz
29eda007bb Fix FLANN_INDEX_KDTREE, add FLANN_INDEX_LSH initialisation 
Add initialisations to make clear what values actually have to be passed.

Moreover, in accordance with 383559c228/modules/flann/include/opencv2/flann/defines.h (L68), I believe `FLANN_INDEX_KDTREE` was being initialised wrongly in the code examples, 1 should be correct, whereas 0 is `FLANN_INDEX_LINEAR`.
 2017-02-22 17:45:21 +01:00
Alexander Alekhin
ee9c0f5f9c Merge pull request #8234 from alalek:issue_8121 2017-02-22 16:21:01 +00:00
Maksim Shabunin
a9e33fe54e Merge pull request #8243 from sovrasov:hal_round_to_cvround 2017-02-22 15:52:10 +00:00
Maksim Shabunin
e192c6842e Merge pull request #8240 from hewj03:issue_1012_contrib 2017-02-22 15:51:07 +00:00
Vladislav Sovrasov
595437bdd1 hal: replace round() with cvRound() 2017-02-22 14:08:38 +03:00
Vladislav Sovrasov
14451f3f06 core: fix adjustROI behavior on indexes overflow 2017-02-22 14:05:51 +03:00
Wenju He
9fbce6c8c8 fix multiband_blend.cu build error in issue opencv_contrib#1012 2017-02-22 08:44:10 +08:00
ionut
a41d877fe6 Change the value of bit/pixel from channels to 8*channels because videos encoded 
by cap_mjpeg_encoder.cpp don't play on windows media player.
Issue number #8113
 2017-02-21 19:15:40 +02:00
Alexander Alekhin
88a338a3eb cmake: disable pkg-config for Apple frameworks 2017-02-21 19:23:37 +03:00
berak
d7240d1a28 fix leaking handle in cap_dshow.cpp 2017-02-21 14:27:12 +01:00
Vitaly Tuzov
9a4b5a4545 OpenVX calls updated to use single common OpenVX context per thread 2017-02-21 16:08:23 +03:00
Alexander Alekhin
ec7f74f7b4 core(TLS): add cleanup() method 2017-02-21 16:08:23 +03:00
Alexander Alekhin
eaba0e6358 cmake: append '-framework UIKit' for videoio/imgcodecs module 2017-02-21 13:37:37 +03:00
Alexander Alekhin
f1c8e04268 ios framework: don't disable opencv_world in dynamic framework 2017-02-21 13:37:37 +03:00
Alexander Alekhin
a78d143c98 ios framework: refactor code (no functional changes) 2017-02-21 13:37:37 +03:00
Pavel Rojtberg
789dc0a3b7 python: type of initial_button_state must match format string 2017-02-21 11:11:22 +01:00
Fangjun KUANG
526220a171 Fix typos in the documentation (#8226) 
* fix typos.

* Fix typos.

* Fix typos.

* Fix typos.

* Fix typos.
 2017-02-21 12:48:15 +03:00
Vadim Pisarevsky
5bfaf9931b Merge pull request #8228 from csukuangfj:csukuangfj-patch 2017-02-21 09:46:09 +00:00
Vadim Pisarevsky
007354ebaf Merge pull request #8233 from Sahloul:features/python_matx 2017-02-21 09:43:26 +00:00
Hamdi Sahloul
232d6b87f4 cv::Matx python wrapper 2017-02-21 11:29:28 +09:00
Fangjun KUANG
b1851e2f16 Add support to print cv::UMat. 
Now a user can use `std::cout` to print an object of `cv::UMat` just like `cv::Mat`.
 2017-02-20 16:22:46 +01:00
Tomoaki Teshima
64cf206fb5 optimize blend using universal intrinsic 
- add more channels/depth performance test for blend
 2017-02-20 19:09:26 +09:00
Alexander Alekhin
b2da9df82d Merge pull request #8221 from csukuangfj:csukuangfj-path-2 2017-02-19 10:16:00 +00:00
LaurentBerger
8638bba670 Merge pull request #8220 from LaurentBerger:Issue5035 2017-02-19 13:15:58 +03:00
Fangjun KUANG
e827a5bd9e Fix an error in the demo code for cv::Mat::forEach 2017-02-18 10:14:29 +01:00
Vadim Pisarevsky
9053839282 Merge pull request #8178 from tomoaki0705:addBayer2RGBA 2017-02-16 15:01:49 +00:00
Vadim Pisarevsky
3240f2a6b7 Merge pull request #8187 from hewj03:improve-MultiBandBlender-cuda 2017-02-16 15:00:58 +00:00
Fangjun KUANG
57ed0e57f0 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.
 2017-02-16 18:00:32 +03:00
Vadim Pisarevsky
ca0b6fbb95 Merge pull request #8203 from alalek:ocl_kernelarg_validate 2017-02-16 14:58:25 +00:00
Alexander Alekhin
0af3638c5a Merge pull request #8214 from jinay1991:patch-1 2017-02-16 11:09:00 +00:00
Jinay Patel
f710d96602 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.
 2017-02-16 15:20:57 +05:30
Alexander Alekhin
bc8a91ed83 Merge pull request #8211 from csukuangfj:csukuangfj-patch-3 2017-02-16 08:57:44 +00:00
Alexander Alekhin
bb8be523c5 Merge pull request #8210 from alalek:fix_mkl_link 2017-02-16 08:56:02 +00:00
Vadim Pisarevsky
236815ec40 Merge pull request #8131 from atinfinity:170205-add_dense_flow_sample 2017-02-15 20:22:57 +00:00
Vadim Pisarevsky
e720427b53 Merge pull request #8153 from Sejsel:patch-1 2017-02-15 20:17:39 +00:00
Fangjun KUANG
a8a208e0fe 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.
 2017-02-15 21:50:14 +03:00
Alexander Alekhin
3fbaabc866 Merge pull request #8209 from csukuangfj:csukuangfj-patch-2 2017-02-15 18:48:01 +00:00
Fangjun KUANG
5e4dfb9546 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.
 2017-02-15 16:44:40 +01:00
Alexander Alekhin
13b0fd993c Merge pull request #8206 from paroj:cast 2017-02-15 15:35:17 +00:00
Alexander Alekhin
05248a3dea cmake: fix order of MKL libraries, don't pass additional libraries as modules 2017-02-15 17:13:13 +03:00