mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-12-12 23:39:07 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
20,942 Commits 6 Branches 127 Tags 3 GiB
c1007c7276
Commit Graph

14874 Commits

Author SHA1 Message Date
Vadim Pisarevsky
ca0b6fbb95 Merge pull request #8203 from alalek:ocl_kernelarg_validate 2017-02-16 14:58:25 +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
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
05248a3dea cmake: fix order of MKL libraries, don't pass additional libraries as modules 2017-02-15 17:13:13 +03:00
Fangjun KUANG
46fe74177d Fix typos. 2017-02-15 14:52:00 +01:00
Pavel Rojtberg
df86f0752a add missing casts to _Tp as determinant() always returns double 2017-02-15 12:21:17 +01:00
Alexander Alekhin
4c7aa8645a 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)
 2017-02-14 16:10:32 +03:00
Alexander Alekhin
1304ad1e12 Merge pull request #8160 from ilijapuaca:master 2017-02-14 13:03:09 +00:00
Alexander Alekhin
b7945827f9 Merge pull request #8175 from alalek:cmake_cleanup_defines 2017-02-13 10:59:09 +00:00
Fangjun KUANG
1e11657ba4 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.
 2017-02-13 13:58:44 +03:00
Wenju He
2722133206 add accuracy test CUDA_MultiBandBlender 2017-02-12 17:16:49 +08:00
Wenju He
b76e88354c improve MultiBandBlender cuda, add normalizeUsingWeight and addSrcWeight kernels 2017-02-12 17:08:05 +08:00
Alexander Alekhin
642e4d97a4 Merge pull request #8165 from AdeelH:master 2017-02-11 11:02:10 +00:00
Tomoaki Teshima
37be9ddeec add enum Bayer**2BGRA 
- let it possible to reach Bayer2BGRA conversion
 2017-02-11 00:20:57 +09:00
Alexander Alekhin
8633ef451e cmake: cleanup unused defines 2017-02-10 15:18:29 +03:00
Ilija Puaca
1b842c4762 Updated version of libwebp to 0.6.0. Removed iOS from build exceptions for libwebp 2017-02-09 23:35:27 +01:00
Adeel
03fb85f179 update fix for #8105 (compiling with mingw32) 
taken from https://github.com/google/googletest/pull/856
 2017-02-09 20:11:00 +05:00
Alexander Alekhin
9ac9e9e29a core: fix String::end() implementation 2017-02-09 16:36:22 +03:00
Vadim Pisarevsky
fb3298f076 Merge pull request #7904 from paroj:initmapfc2 2017-02-08 13:30:15 +00:00
Alexander Alekhin
476d2e1eea Merge pull request #8140 from StevenPuttemans:fix_gdal_driver_4channel_16bit 2017-02-08 11:29:34 +00:00
Vitaly Tuzov
4950f542d1 Fix for SGBM compute() buffer allocation failure on big images 2017-02-08 12:49:21 +03:00
StevenPuttemans
22d8a81a57 enable processing of 16, 32 and 64 bit 4 channel data using GDAL1.2 2017-02-07 15:51:45 +01:00
LaurentBerger
b3c1bd788a Add note about OTSU and TRIANGLE (comment sovrasov) 2017-02-07 10:14:24 +01:00
LaurentBerger
fa4d32f7dd Solve issue 8136 opencv doc of threshold 2017-02-06 22:49:18 +01:00
Alexander Alekhin
072f873df6 Merge pull request #8133 from StevenPuttemans:add_detectMultiScale_notice 2017-02-06 10:36:06 +00:00
Alexander Alekhin
f0637e5e91 Merge pull request #8132 from tonytheodore:highgui-gl 2017-02-06 10:35:27 +00:00
Alexander Alekhin
519e452e1a Merge pull request #8128 from LaurentBerger:MatrixExpressions 
Add a link to MatExpr in Detailed Description of Mat
 2017-02-06 10:34:12 +00:00
Alexander Alekhin
89eca83f5b Merge pull request #8123 from msk-repo01:master 2017-02-06 10:32:23 +00:00
Alexander Alekhin
48f7cbec75 Merge pull request #8107 from reunanen:fix8093 2017-02-06 10:31:34 +00:00
StevenPuttemans
bfb18d29a6 add explanation to detectMultiScale overload functionality 2017-02-06 10:38:03 +01:00
Tony Theodore
678e114e5f highgui: use forward slash for gl.h include 
The backslash causes build failure when cross-compiling with mingw-w64
 2017-02-06 04:15:10 +11:00
LaurentBerger
488eb11ba8 Add a link to MatExpr in Detailed Description of Mat 2017-02-04 11:10:50 +01:00
msk-repo01
9a1835ce66 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)
 2017-02-02 13:47:09 -08:00
PkLab
ece3fac7ef Merge pull request #8112 from PkLab:Fix_7898 
CoInitialize/CoUninitialize in VFW classes (#8112)
 2017-02-01 14:37:24 +00:00
Pavel Vlasov
a47b7a34be Adds IPP control functions to bindings export 2017-02-01 10:29:35 +03:00
Alexander Alekhin
3476440ec3 Merge pull request #8078 from tomoaki0705:universalIntrinsicLapack 2017-01-31 18:46:54 +00:00
utibenkei
6501d54267 Fix bug that occurs when module name and inherited class name are same. 2017-01-31 22:42:30 +09:00
Juha Reunanen
f3cb5084cf Fix #8093: CV_DbgAssert that the result of area() fits in the return value 2017-01-31 15:02:36 +02:00
Vadim Pisarevsky
dfb348ef0b Merge pull request #8081 from mshabunin:fix-kmeans-compactness 2017-01-31 12:19:46 +00:00
Maksim Shabunin
0aab7c6fc3 Merge pull request #8077 from sovrasov:mog2_docs_update 2017-01-31 09:13:53 +00:00
Maksim Shabunin
13dffa0017 Merge pull request #8103 from sovrasov:em_docs_update 2017-01-31 09:10:37 +00:00
Maksim Shabunin
b417b4dbee KMeans improvement 
- fixed returned compactness value
- added centers drawing to the example app
- added compactness test
 2017-01-31 12:05:08 +03:00
Tomoaki Teshima
fd711219a2 use universal intrinsic in VBLAS 
- brush up v_reduce_sum of SSE version
 2017-01-31 05:36:27 +09:00
Vladislav Sovrasov
a789c08588 ml::EM: add documentation for predict() method 2017-01-30 17:38:13 +03:00
Alexander Alekhin
75533fcd06 Merge pull request #8098 from chrizandr:Tree_load_Wrapper 
Add wrappers for load functions for DTrees and Boost classifiers
 2017-01-30 17:25:23 +03:00
Alexander Alekhin
82902b6fd5 Merge pull request #8082 from PkLab:fix_videoio_doc 2017-01-30 14:05:03 +00:00
Alexander Alekhin
124c4825a7 Merge pull request #8089 from hrnr:estimate_convert_fix 
fix wrong conversion in estimateAffine2D* functions
 2017-01-30 16:53:50 +03:00
Alexander Alekhin
11470077e1 Merge pull request #8099 from chrizandr:ML_Wrappers 
Wrappers for load methods of EM, LR, SVMSGD and Normal Bayes Classifier
 2017-01-30 16:52:31 +03:00
Alexander Alekhin
67e24dd347 Merge pull request #8088 from paroj:vtkfix 2017-01-30 13:51:41 +00:00
chrizandr
519fbdb8ab Wrappers for load methods of EM, LR, SVMSGD and Normal Bayes Classifier 2017-01-29 18:51:55 +05:30
chrizandr
d22df8c41f Add wrappers for load functions for DTrees and Boost classifiers 2017-01-29 15:55:38 +05:30
Alexander Alekhin
a8aff6f643 Merge pull request #8085 from tomoaki0705:checkSse2 2017-01-28 11:40:04 +00:00
Jiri Horner
4ee25c7e95 add test for convertions in estimateAffine2D* functions 
test with integer points to cover conversion bugs.
 2017-01-27 22:16:58 +01:00
Jiri Horner
9408a5ef5d 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
 2017-01-27 16:55:29 +01:00
Pavel Rojtberg
67f163892e viz: fix compilation - we need the VTK includes before ocv_define_module 2017-01-27 15:51:19 +01:00
Tomoaki Teshima
d0bdf99501 check correct flag 2017-01-27 18:42:58 +09:00
PkLab.net
eb768514c3 Fix misplaced description CAP_PROP_SETTINGS and others minor changes in videoio doc 2017-01-26 17:10:32 +01:00
Alexander Alekhin
ec47a0a6de build: workaround for missing _mm256_setr_m128 in GCC 2017-01-26 18:39:38 +03:00
Alexander Alekhin
74defefd61 Merge pull request #8076 from tomoaki0705:brushupAvxPopcount 2017-01-26 12:57:14 +00:00
Vladislav Sovrasov
4e0351bafd Clarify docs for MOG2::apply 2017-01-26 12:43:41 +03:00
Tomoaki Teshima
820fdbff23 brush up AVX optimization in popcount 
- make sure SIMD optimization works even when AVX is not available
 2017-01-26 18:37:56 +09:00
Alexander Alekhin
c1dec72fb6 java: force 64F in solvePnP test 2017-01-25 19:42:09 +03:00
Alexander Alekhin
aa5caf83f6 Merge pull request #8072 from tomoaki0705:AVXcorner 2017-01-25 16:10:59 +00:00
Alexander Alekhin
993ff7ad12 Merge pull request #8071 from tomoaki0705:imgprocRemoveRedundantCheck 2017-01-25 16:09:15 +00:00
Alexander Alekhin
3413c23b34 Merge pull request #8061 from tomoaki0705:universalIntrinsicStereoCalib3d 2017-01-25 16:08:02 +00:00
Alexander Alekhin
383559c228 Merge pull request #8062 from mshabunin:add-cv_deprecated 2017-01-25 15:04:42 +00:00
Tomoaki Teshima
07979b02c3 optimize corner detection series using AVX instructions 
- make sure SSE version will be still available for backward compatibility
 2017-01-25 22:35:11 +09:00
Tomoaki Teshima
ddca982c09 remove pure SSE part 2017-01-25 22:05:53 +09:00
Alexander Alekhin
9e9fd281b9 Merge pull request #8044 from alalek:opencv_world_with_contrib 2017-01-25 12:54:16 +00:00
Alexander Alekhin
5c13ffb73e Merge pull request #8060 from Legoless:master 2017-01-25 11:32:24 +00:00
Alexander Alekhin
a446cb271f Merge pull request #8065 from paroj:pnpfloat 
solvePnP: use CV_32F for rvec, tvec if all PnP inputs are CV_32F
 2017-01-25 12:50:05 +03:00
Pavel Rojtberg
3e708e015c solvePnP: use CV_32F for rvec, tvec if all PnP inputs are CV_32F 2017-01-24 18:17:46 +01:00
mshabunin
c6c519166e Added CV_DEPRECATED macro 2017-01-24 15:57:06 +03:00
Vadim Pisarevsky
2bac66a181 Merge pull request #8004 from chrizandr:RTrees_load_wrapper 2017-01-24 11:55:42 +00:00
Vadim Pisarevsky
ff5eaadfdf Merge pull request #8045 from onetimking:master 2017-01-24 11:44:56 +00:00
Dal Rupnik
c10283b2b6 Replaced macro with built-in OpenCV export 2017-01-24 10:26:19 +01:00
Tomoaki Teshima
b34ebc8cfe use universal intrinsic in stereo matching 
- check SIMD availability before executing
 2017-01-24 18:25:22 +09:00
Dal Rupnik
a50efda49d Added export functions for ObjC classes 2017-01-23 17:15:17 +01:00
Alexander Alekhin
a5d16f09e6 cmake world: allow to build python bindings 2017-01-23 18:45:53 +03:00
Alexander Alekhin
36b34465a4 cmake: include contrib modules into opencv_world 2017-01-23 18:45:53 +03:00
Alexander Alekhin
9bb5d6cab0 remove precomp.cpp 2017-01-23 18:45:53 +03:00
Alexander Alekhin
205ccddff8 Merge pull request #8053 from pwuertz:umat-copy-python 2017-01-23 13:20:56 +00:00
Tomoaki Teshima
1d01e435ca use universal intrinsic in fast 2017-01-23 19:03:22 +09:00
Peter Würtz
c659f94dca Expose more UMat constructors to python 2017-01-22 13:11:13 +01:00
Alexander Alekhin
bb5c40d944 Merge pull request #8049 from tomoaki0705:universalIntrinsicCorner 2017-01-20 16:43:48 +00:00
Dal Rupnik
e71ff78f7f Merge pull request #8009 from Legoless:master 
CMake: Building Dynamic Framework on iOS (#8009)

* Updated python script with dynamic parameter

Updated python script to build static library by default

Updated python script to include bitcode flag

Added bitcode flag to c flags

Fixed directories and targets with static

Bitcode parameter fixed

Fixed script for static library

Fixed parameters in build function

Updated cmake common toolchain

Added changes to OpenCV Utils

Updates to cmake

Added cache internal

Updates to common toolchain

Fixed path in framework destination and added UIKit dependency

Dynamic plist for framework

Lib version removed hardcoded value

Removed trailing whitespace in toolchain

* Removed trailing whitespace

* Fixed typo in comment

* Renamed bitcode variable to bitcodedisabled

* Fixed target device family
 2017-01-20 19:16:01 +03:00
Tomoaki Teshima
062d2179eb use universal intrinsic in corner detection series 2017-01-20 19:22:44 +09:00
Alexander Alekhin
a46adbfcbc Merge pull request #8020 from alalek:fix_4976 2017-01-19 15:40:07 +00:00
Alexander Alekhin
c25f587584 Merge pull request #7926 from saskatchewancatch:issue-7310 2017-01-19 14:03:43 +00:00
chrizandr
e3ec3566d9 RTrees: Add wrapper for RTrees_load method to enable loading trained RTrees 2017-01-19 17:16:45 +05:30
Tim King
203b398caa Fixed bug #7482. Updated dense flow routine to reference bound textures. 2017-01-18 19:30:45 +02:00
Alexander Alekhin
a22f03e749 Merge pull request #7863 from tomoaki0705:universalIntrinsicPopcount 2017-01-18 17:25:02 +00:00
Alexander Alekhin
7c91700cc6 Merge pull request #7999 from alalek:fix_lapack 2017-01-18 13:20:30 +00:00
Alexander Alekhin
85ef02bc5c Merge pull request #8023 from sovrasov:fs_add_full_yml_type_heading 2017-01-18 12:08:10 +00:00
Alexander Alekhin
a2b6b595c2 shape: force column-based vector 2017-01-18 13:02:51 +03:00
Alexander Alekhin
1989d94ef5 Merge pull request #7941 from wykvictor:master 2017-01-17 14:34:04 +00:00
Vladislav Sovrasov
896c34fab3 Add support of type headings from YAML1.2 2017-01-17 16:40:38 +03:00
Alexander Alekhin
3668a01fca eliminate warnings 
hal_internal.cpp(101): warning C4267: 'initializing': conversion from 'size_t' to 'int', possible loss of data
 2017-01-17 15:56:42 +03:00
Alexander Alekhin
2b44c0b649 cmake: fix lapack 
- added compile check with multiple tries for different configurations
- restored find_package(LAPACK)
- avoided modification of OPENCV_LINKER_LIBS
 2017-01-17 15:56:42 +03:00
berak
89a740a62f Merge pull request #8019 from berak:patch-2 
ml: fix small typo in lr.cpp (#8019)
 2017-01-17 13:57:50 +03:00
Alexander Alekhin
5b363df2ae Merge pull request #8000 from mshabunin:fix-opencl-clahe 2017-01-16 10:01:59 +00:00
Vadim Pisarevsky
10e639cdb9 Merge pull request #7966 from Tetragramm:Issue#4235 2017-01-13 14:24:57 +00:00
mshabunin
8c66531c42 imgproc/CLAHE/ocl: Removed unnecessary __local variable 2017-01-13 16:25:43 +03:00
Alexander Alekhin
c9cedf3c5b Merge pull request #7998 from alalek:fix_7993 2017-01-12 16:57:25 +00:00
Alexander Alekhin
f94e64a0ae cuda: fix CUDA tests initialization 2017-01-12 16:15:52 +03:00
Tomoaki Teshima
8b22099da2 use universal intrinsic and SSE4 popcount instruction in normHamming 
- add v_popcount in universal intrinsic
 - add test for v_popcount
 - add wrapper of popcount for both MSVC and GCC
 2017-01-12 09:09:22 +09:00
Vadim Pisarevsky
ec5038f2a7 Merge pull request #7947 from utibenkei:tracking-module-java 2017-01-11 11:41:19 +00:00
Tetragramm
7cc0b0f93e Add case including both moments empty. 2017-01-10 21:38:31 -06:00
Vadim Pisarevsky
b345c6e552 Merge pull request #7935 from alalek:fix_waitKey 2017-01-10 11:18:13 +00:00
Vadim Pisarevsky
c0cde75d54 Merge pull request #7975 from tomoaki0705:cleanupCalib3dStereo 2017-01-10 11:12:15 +00:00
Vadim Pisarevsky
85474f581d Merge pull request #7983 from LaurentBerger:docFindcontours 2017-01-10 11:10:16 +00:00
Alexander Alekhin
e6d7989b20 Merge pull request #7986 from atinfinity:pullreq/170109-add_USE_AVX2_condition 2017-01-09 16:11:00 +00:00
Maksim Shabunin
406fe899d5 Merge pull request #7965 from D-Barber:stereoCalibrateR2T2CalculationTinyDocumentationFix 2017-01-09 13:16:38 +00:00
atinfinity
b3c77e664d added to check the support of AVX2 2017-01-09 19:51:33 +09:00
LaurentBerger
e6f27240d5 dd a note in findcontours doc 2017-01-08 15:24:29 +01:00
Tomoaki Teshima
f1aae52daf clean up unused #if 2017-01-06 18:23:45 +09:00
Alexander Alekhin
45f0cf0d41 Merge pull request #7959 from alalek:fix_7957 2017-01-06 02:10:06 +00:00
Tetragramm
d33d37ffd9 Add check for all zero moments. If one of the shapes is empty, the match would return zero distance between the shapes even when the other one had content. It now returns DBL_MAX if no moments had value. 2017-01-04 18:38:46 -06:00
Duncan Barber
1c3b9d7591 Tiny documentation fix in stereoCalibrate 
Modified the (R2,T2) computation documentation in the stereoCalibrate function documentation to display on two lines for clarity
 2017-01-04 21:24:25 +00:00
Alexander Alekhin
9be630466f Merge pull request #7948 from LorenaGdL:hitmiss_tutorial 2017-01-03 19:35:40 +00:00
Alexander Alekhin
fa36b9d345 imgproc: fix using of uninitialized edge[] members in FillConvexPoly 2017-01-03 22:18:27 +03:00
Lorena García
3650ec02be HitMiss tutorial 2017-01-03 18:34:04 +01:00
Matt Bennett
c3a8db6d6c Merge pull request #7952 from mattmyne:JSONWriteFixTrailingDecimalPoint 
Append zero to trailing decimal place for FileStorage JSON write of a float or double value (#7952)

* Fix for FileStorage JSON write of a float or double value that has no fractional part; appends a zero character after the trailing decimal place to meet JSON standard.

* strlen return to size_t type rather than unnecessary cast to int
 2017-01-02 20:28:07 +00:00
Alexander Alekhin
23e53a32e5 Merge pull request #7950 from BadrinathS:firstbugfix-lr_opencv 2016-12-31 12:48:54 +00:00
BadrinathS
d1f727191f Resolving issue #7924 2016-12-31 16:37:51 +05:30
utibenkei
579ffbf97e Added Java wrapping for tracking module 2016-12-31 02:19:38 +09:00
Steve
8a6fabed83 Avoid segmentation fault 
Change `<=` to `<` to avoid accessing the first character of an empty string
 2016-12-29 17:23:40 -08:00
Yakun Wang
c6f666a02b BufferPool is used for temporary buffer, use mat create directly 2016-12-29 18:29:44 +08:00
wykvictor
5fad2a3f24 Speedup MedianFilter::apply() when calling repeatedly 
Speedup MedianFilter::apply(), avoid to newly create the two GpuMat every time calling filter->apply(), which is very time consuming.
 2016-12-29 17:11:58 +08:00
Alexander Alekhin
d015b55e6b highgui: preserve waitKey -1 return value 2016-12-28 13:06:28 +03:00
Raj Natarajan
b7a053b0e5 Issue-7310: Updated imwrite doc to correct default setting for IMWRITE_PNG_COMPRESSION and clarified existing doc a bit. 2016-12-26 00:44:43 -06:00
Alexander Alekhin
7dd3723abe Merge tag '3.2.0' 2016-12-23 16:20:02 +03:00
Alexander Alekhin
70bbf17b13 OpenCV Version++ 
3.2.0
 2016-12-23 15:54:44 +03:00
Alexander Alekhin
d0f883524e cmake(osx): fix CoreImage error (#7916) 2016-12-23 11:30:17 +03:00
Vadim Pisarevsky
ad74fdd7cc moved BLAS/LAPACK detection scripts from opencv_contrib/dnn to the main repository (#7918) 
* moved BLAS/LAPACK detection scripts from opencv_contrib/dnn to the main repository.

* trying to fix the bug with undefined symbols sgesdd_ and dgesdd_

* removed extra whitespaces; disabled LAPACK on IOS
 2016-12-22 22:57:44 +03:00
Alexander Alekhin
dc31ddc80a photo: fix InputArray -> CvMat 2016-12-22 04:22:47 +03:00
Alexander Alekhin
ca6beb9ca8 calib3d: fix InputArray -> CvMat 2016-12-22 04:22:46 +03:00
Vitaly Tuzov
be7d060ea4 Merge pull request #7802 from terfendail:ovxhal_wrappers_migration 
* OpenVX HAL updated to use generic OpenVX wrappers

* vxErr class from OpenVX HAL replaced with ivx::WrapperError

* reduced usage of vxImage class from OpenVX HAL replaced with ivx::Image

* vxImage class rewritten as ivx::Image subclass that calls swapHandle prior release

* Fix OpenVX HAL build

* Fix for review comments
 2016-12-21 15:19:06 +02:00
Pavel Rojtberg
40686b5e87 initUndistortRectifyMap: CV_32FC2 is also supported as m1type 2016-12-20 10:22:32 +01:00
Alexander Alekhin
a4db9833f7 Merge pull request #7885 from alalek:release-3.2.0-rc 2016-12-19 17:59:14 +00:00
Alexander Alekhin
ece08374a1 Merge pull request #7838 from khnaba:morphology-32f 2016-12-19 16:22:03 +00:00
Vadim Pisarevsky
c64ac42b27 Merge pull request #7852 from savuor:fix/orb_rotation 2016-12-19 16:19:38 +00:00
Alexander Alekhin
d85c11e525 OpenCV version++ 
3.2.0-rc
 2016-12-19 17:12:18 +03:00
Alexander Alekhin
86bb523991 Merge pull request #7871 from savuor:fix/openvx_cvt_on 2016-12-19 13:51:53 +00:00
Vadim Pisarevsky
ae9f80c1a9 Merge pull request #7855 from logic1988:master 2016-12-19 13:45:51 +00:00
Alexander Alekhin
07004a46ca Merge pull request #7773 from savuor:openvx_harris 2016-12-19 11:39:38 +00:00