Vadim Pisarevsky [Wed, 10 Aug 2016 10:49:05 +0000 (10:49 +0000)]
Merge pull request #7071 from K-Shinotsuka:issue14
Alexander Alekhin [Wed, 10 Aug 2016 10:48:31 +0000 (10:48 +0000)]
Merge pull request #7070 from paroj:noculegacy
Alexander Alekhin [Wed, 10 Aug 2016 10:44:52 +0000 (13:44 +0300)]
Merge pull request #7072 from alalek:ocl_fix_canny
Vadim Pisarevsky [Wed, 10 Aug 2016 10:31:12 +0000 (10:31 +0000)]
Merge pull request #6983 from K-Shinotsuka:issue8
Vadim Pisarevsky [Wed, 10 Aug 2016 10:25:17 +0000 (10:25 +0000)]
Merge pull request #7076 from sovrasov:mkl_lapack
Alexander Alekhin [Wed, 10 Aug 2016 10:05:52 +0000 (13:05 +0300)]
Merge pull request #7074 from sovrasov:interactive_calib_fix
Vadim Pisarevsky [Wed, 10 Aug 2016 09:26:51 +0000 (09:26 +0000)]
Merge pull request #6955 from snosov1:fix-6836
Vadim Pisarevsky [Wed, 10 Aug 2016 09:26:13 +0000 (09:26 +0000)]
Merge pull request #6949 from wiryls:FileStorageBase64DocsTests
Vladislav Sovrasov [Tue, 9 Aug 2016 13:28:45 +0000 (16:28 +0300)]
Add MKL support
Alexander Alekhin [Tue, 9 Aug 2016 12:59:38 +0000 (12:59 +0000)]
Merge pull request #7044 from wolever:master
Vladislav Sovrasov [Tue, 9 Aug 2016 12:29:57 +0000 (15:29 +0300)]
Fix build interactive-calibration app
Alexander Alekhin [Tue, 9 Aug 2016 10:39:55 +0000 (10:39 +0000)]
Merge pull request #7067 from tomoaki0705:fixBuildErrorJetsonK1
k-shinotsuka [Tue, 9 Aug 2016 09:59:29 +0000 (18:59 +0900)]
improve LKTrackerInvoker::operator()
Alexander Alekhin [Tue, 9 Aug 2016 09:48:06 +0000 (12:48 +0300)]
ocl: fix Canny for Intel devices
There is an issue with processing of abs(short) function for
negative argument.
Affected OpenCL devices:
- iGPU: Intel(R) HD Graphics 520 (OpenCL 2.0 )
- CPU: Intel(R) Core(TM) i5-6300U CPU @ 2.40GHz (OpenCL 2.0 (Build 10094))
Pavel Rojtberg [Mon, 8 Aug 2016 13:43:04 +0000 (15:43 +0200)]
stitching: use correct ifdef to allow compilation without cudalegacy
GraphCutSeamFinderGpu requires cudalegacy.
Tomoaki Teshima [Mon, 8 Aug 2016 13:13:13 +0000 (22:13 +0900)]
fix build error on JetsonTK1
* avoid using vld1_f16 and vst1_f16 on gcc 4 series (Ubuntu 14.04)
* guard correctly with #if
* use static inline
Vadim Pisarevsky [Mon, 8 Aug 2016 15:31:11 +0000 (15:31 +0000)]
Merge pull request #7059 from berak:doc_python_drawkeypoints
Vadim Pisarevsky [Mon, 8 Aug 2016 15:20:10 +0000 (15:20 +0000)]
Merge pull request #7016 from lewgate:bugfix_2
Vadim Pisarevsky [Mon, 8 Aug 2016 15:19:36 +0000 (15:19 +0000)]
Merge pull request #7024 from paroj:semanticidx
Vadim Pisarevsky [Mon, 8 Aug 2016 15:18:49 +0000 (15:18 +0000)]
Merge pull request #7043 from alalek:add_nonfree_flag
Vadim Pisarevsky [Mon, 8 Aug 2016 15:17:48 +0000 (15:17 +0000)]
Merge pull request #7042 from alalek:update_6967
Vadim Pisarevsky [Mon, 8 Aug 2016 14:43:57 +0000 (14:43 +0000)]
Merge pull request #7047 from tomoaki0705:brushUpFp16Cuda
Maksim Shabunin [Mon, 8 Aug 2016 13:22:49 +0000 (13:22 +0000)]
Merge pull request #7066 from StevenPuttemans:fix_build_cuda_issues
Alexander Alekhin [Mon, 8 Aug 2016 11:49:41 +0000 (11:49 +0000)]
Merge pull request #7060 from catree:add_camera_model_doc
Alexander Alekhin [Mon, 8 Aug 2016 11:38:19 +0000 (11:38 +0000)]
Merge pull request #7040 from sovrasov:calib_tutorial_code_update
StevenPuttemans [Mon, 8 Aug 2016 10:12:35 +0000 (12:12 +0200)]
fixing issues
Vladislav Sovrasov [Thu, 4 Aug 2016 11:10:15 +0000 (14:10 +0300)]
Improvements in camera_calibration tutorial code
berak [Sun, 7 Aug 2016 13:59:11 +0000 (15:59 +0200)]
python docs: fix missing output image in cv2.drawKeypoint examples
catree [Mon, 8 Aug 2016 01:31:31 +0000 (03:31 +0200)]
Modify the figure of the pinhole camera model with pixels starting from the uv axis.
mschoeneck [Fri, 5 Aug 2016 14:20:56 +0000 (16:20 +0200)]
Merge pull request #6958 from mschoeneck:Common-Canny-parallelization
* Common Canny parallelization added. TBB and single thread code removed. Final pass vectorized with SSE2 intrinsics.
* wrong #ifdef replaced with #if
* Merged to actual Canny version
* Merged common parallelized Canny with actual Canny implementation
* Remove 'Mutex *mutex' and pass 'Mutex mutex' from outside to parallelCanny
* Replaced extern Mutex with intern mutable Mutex.
Tomoaki Teshima [Mon, 1 Aug 2016 09:42:09 +0000 (18:42 +0900)]
follow the naming rule as other API
* stop using 'CUDA' prefix
* add explanation
Alexander Alekhin [Thu, 4 Aug 2016 15:05:39 +0000 (18:05 +0300)]
imgproc: sepFilter: update OpenCL condition
Problem is observed with test_loop_times=100
in corner cases like 93x1 or similar
Alexander Alekhin [Thu, 4 Aug 2016 14:50:23 +0000 (17:50 +0300)]
imgproc: disable IPP for GaussianBlur in case of ROI
matze [Thu, 21 Jul 2016 17:59:26 +0000 (19:59 +0200)]
imgproc: Prefer OCL calculation before IPP in GaussianBlur.
MYLS [Fri, 5 Aug 2016 08:15:03 +0000 (16:15 +0800)]
fixed two bugs that I caused.
MYLS [Fri, 5 Aug 2016 07:17:21 +0000 (15:17 +0800)]
make some changes according to the code review.
- use `std::string` instead of `new char`;
- reserve 1 MB for buffer;
David Wolever [Thu, 4 Aug 2016 16:44:07 +0000 (12:44 -0400)]
Cleaner fix for crash on double-stop of CvVideoCamera
Alexander Alekhin [Thu, 4 Aug 2016 16:23:49 +0000 (19:23 +0300)]
cmake: add OPENCV_ENABLE_NONFREE option and macro
Vadim Pisarevsky [Thu, 4 Aug 2016 13:37:29 +0000 (13:37 +0000)]
Merge pull request #7020 from StevenPuttemans:add_scale_option
Vadim Pisarevsky [Thu, 4 Aug 2016 13:34:55 +0000 (13:34 +0000)]
Merge pull request #7029 from wolever:master
Maksim Shabunin [Thu, 4 Aug 2016 13:23:41 +0000 (13:23 +0000)]
Merge pull request #7038 from StevenPuttemans:fix_module_including
Vadim Pisarevsky [Thu, 4 Aug 2016 12:13:35 +0000 (12:13 +0000)]
Merge pull request #7039 from vpisarev:2_small_fixes
k-shinotsuka [Mon, 25 Jul 2016 11:47:30 +0000 (20:47 +0900)]
improve MomentsInTile_SIMD<uchar, int, int>()
Vadim Pisarevsky [Thu, 4 Aug 2016 09:52:10 +0000 (12:52 +0300)]
1. fix warning from Xcode 7.x
2. fixed parsing of "cat[range_spec]ord[range_spec]" type specification string when using ml::TrainData::loadFromCSV(). Thanks to A. Kaehler for reporting it
StevenPuttemans [Thu, 4 Aug 2016 09:32:33 +0000 (11:32 +0200)]
fix including of correct header files #7027
Alexander Alekhin [Thu, 4 Aug 2016 09:31:52 +0000 (09:31 +0000)]
Merge pull request #7033 from tomoaki0705:brushUpFp16
Vadim Pisarevsky [Thu, 4 Aug 2016 09:14:03 +0000 (09:14 +0000)]
Merge pull request #7026 from sovrasov:calib_points_number
Vadim Pisarevsky [Wed, 3 Aug 2016 18:50:00 +0000 (18:50 +0000)]
Merge pull request #6970 from K-Shinotsuka:issue6
Vadim Pisarevsky [Wed, 3 Aug 2016 18:44:02 +0000 (18:44 +0000)]
Merge pull request #7010 from K-Shinotsuka:issue10
Vadim Pisarevsky [Wed, 3 Aug 2016 18:34:07 +0000 (18:34 +0000)]
Merge pull request #7011 from K-Shinotsuka:issue11
Alexander Alekhin [Wed, 3 Aug 2016 10:20:23 +0000 (10:20 +0000)]
Merge pull request #7030 from jpaveggio:patch-1
k-shinotsuka [Fri, 29 Jul 2016 14:18:02 +0000 (23:18 +0900)]
improve SumSqr_SIMD<schar, int, int>()
Tomoaki Teshima [Wed, 3 Aug 2016 07:53:52 +0000 (16:53 +0900)]
brush up convertFp16
* raise an error when wrong bit depth passed
* raise an build error when wrong depth is specified for cvtScaleHalf_
* remove unnecessary safe check in cvtScaleHalf_
* use intrinsic instead of direct pointer access
* update the explanation
Juan Pablo Aveggio [Tue, 2 Aug 2016 23:53:05 +0000 (20:53 -0300)]
Update bagofwords.cpp
David Wolever [Tue, 2 Aug 2016 21:52:02 +0000 (17:52 -0400)]
Fix crash on double-stop of CvVideoCamera
k-shinotsuka [Fri, 29 Jul 2016 11:10:14 +0000 (20:10 +0900)]
improve SumSqr_SIMD<uchar, int, int>()
k-shinotsuka [Fri, 22 Jul 2016 14:03:57 +0000 (23:03 +0900)]
improve thresh_8u()
Vadim Pisarevsky [Tue, 2 Aug 2016 14:30:02 +0000 (14:30 +0000)]
Merge pull request #6959 from LeoBras:Better_StereoBM
Jeff McBride [Tue, 12 Apr 2016 01:43:41 +0000 (01:43 +0000)]
Don't assume all images have the same number of calibration points
Cast to (int) to avoid warnings
Add test for different points number case in fisheye calibration function
Pavel Rojtberg [Tue, 2 Aug 2016 09:38:14 +0000 (11:38 +0200)]
Mat: use row/ col instead of i0/ i1 for parameter names in 2D case
this improves documentation when using an IDE and reflects that Mats are
row major.
StevenPuttemans [Mon, 1 Aug 2016 13:19:07 +0000 (15:19 +0200)]
allow for screen size related resizing
Alexander Alekhin [Tue, 2 Aug 2016 08:39:24 +0000 (08:39 +0000)]
Merge pull request #6991 from tomoaki0705:featureGpuMatFp16
Alexander Alekhin [Mon, 1 Aug 2016 13:27:33 +0000 (13:27 +0000)]
Merge pull request #7018 from catree:add_camera_model_doc
catree [Mon, 1 Aug 2016 00:25:45 +0000 (02:25 +0200)]
Add pinhole camera model illustration in calib3d documentation.
Tomoaki Teshima [Mon, 25 Jul 2016 23:58:34 +0000 (08:58 +0900)]
cudev: add feature to convert FP32(float) from/to FP16(half) on GPU
* add feature of Fp16 on GPU (cudev)
* add test
* leave template function as unimplemented to raise error
lewgate [Sun, 31 Jul 2016 09:13:23 +0000 (17:13 +0800)]
Fix a bug for seam_finders.cpp when computing the source and destination points of the seam
MYLS [Fri, 29 Jul 2016 18:05:15 +0000 (02:05 +0800)]
solve warnings in sample file
MYLS [Fri, 29 Jul 2016 17:08:27 +0000 (01:08 +0800)]
Merge remote-tracking branch 'refs/remotes/opencv/master' into FileStorageBase64DocsTests
# Conflicts:
# modules/core/test/test_io.cpp
MYLS [Fri, 29 Jul 2016 16:35:41 +0000 (00:35 +0800)]
change `code` to `snippet` and do some cleaning.
- use `@snippet` instead of `@code` in docs.
- remove some functions that were not used.
Alexander Alekhin [Fri, 29 Jul 2016 10:35:54 +0000 (10:35 +0000)]
Merge pull request #6999 from tomoaki0705:featureCmakeFp16
Tomoaki Teshima [Thu, 28 Jul 2016 22:00:10 +0000 (07:00 +0900)]
show CPU feature correctly when FP16 is available
* make sure that CV_FP16 has the correct meaning
* check FP16 feature correctly
Vadim Pisarevsky [Thu, 28 Jul 2016 15:27:39 +0000 (15:27 +0000)]
Merge pull request #6989 from mself:gftt-deterministic-sort
Vadim Pisarevsky [Thu, 28 Jul 2016 12:05:13 +0000 (12:05 +0000)]
Merge pull request #6984 from K-Shinotsuka:issue9
Vadim Pisarevsky [Thu, 28 Jul 2016 11:51:12 +0000 (11:51 +0000)]
Merge pull request #6996 from juliendehos:merge_debevec
Vadim Pisarevsky [Thu, 28 Jul 2016 11:42:07 +0000 (11:42 +0000)]
Merge pull request #7007 from tomoaki0705:fixDocTypo
Vadim Pisarevsky [Thu, 28 Jul 2016 11:35:06 +0000 (11:35 +0000)]
Merge pull request #6986 from Wing0:master
Tomoaki Teshima [Thu, 28 Jul 2016 09:35:16 +0000 (18:35 +0900)]
doc: fix typo and grammar
Alexander Alekhin [Wed, 27 Jul 2016 20:10:37 +0000 (20:10 +0000)]
Merge pull request #7006 from derlunz:fix-qtopengl-build
Alexander Alekhin [Wed, 27 Jul 2016 18:24:17 +0000 (18:24 +0000)]
Merge pull request #7004 from StevenPuttemans:cmd_parser_opencv_annotation
Alexander Alekhin [Wed, 27 Jul 2016 18:17:37 +0000 (18:17 +0000)]
Merge pull request #7000 from StevenPuttemans:fix_master_build
Alexander Alekhin [Wed, 27 Jul 2016 18:16:36 +0000 (18:16 +0000)]
Merge pull request #7002 from StevenPuttemans:add_extra_limits_to_help
Christian Kapeller [Wed, 27 Jul 2016 14:14:57 +0000 (16:14 +0200)]
highgui: window QT+OpenGL mouse wheel support, another build fix
amends work done in pull request #6976.
StevenPuttemans [Wed, 27 Jul 2016 12:02:28 +0000 (14:02 +0200)]
change parameter input to the CommandLineParser interface
k-shinotsuka [Mon, 25 Jul 2016 13:12:25 +0000 (22:12 +0900)]
improve MomentsInTile_SIMD<ushort, int, int>()
StevenPuttemans [Wed, 27 Jul 2016 09:39:50 +0000 (11:39 +0200)]
add limits of tool to help message
StevenPuttemans [Wed, 27 Jul 2016 09:21:08 +0000 (11:21 +0200)]
fix build #6993
Your Name [Wed, 27 Jul 2016 02:46:58 +0000 (23:46 -0300)]
Tabs -> Whitespaces.
Your Name [Wed, 27 Jul 2016 02:29:05 +0000 (23:29 -0300)]
Fixed using local variable instead of global var.
- Still need to change SSE_2
Alexander Alekhin [Tue, 26 Jul 2016 20:15:45 +0000 (20:15 +0000)]
Merge pull request #6987 from tomoaki0705:fixTypoCalib3d
Julien Dehos [Tue, 26 Jul 2016 16:01:36 +0000 (18:01 +0200)]
fix a bug in MergeDebevec (modify input times)
Matthew Self [Tue, 26 Jul 2016 04:17:54 +0000 (21:17 -0700)]
Make goodFeaturesToTrack() return deterministic results
When using OCL, the results of goodFeaturesToTrack() vary slightly from
run to run. This appears to be because the order of the results from
the findCorners kernel depends on thread execution and the sorting
function that is used at the end to rank the features only enforces are
partial sort order.
This does not materially impact the quality of the results, but it
makes it hard to build regression tests and generally introduces noise
into the system that should be avoided.
An easy fix is to change the sort function to enforce a total sort on
the features, even in cases where the match quality is exactly the same
for two features.
Tomoaki Teshima [Tue, 26 Jul 2016 03:56:10 +0000 (12:56 +0900)]
calib3d: fix typo
Oskari Vinko [Mon, 25 Jul 2016 18:25:38 +0000 (20:25 +0200)]
Corrected tutorial grammar and sentences
Alexander Alekhin [Mon, 25 Jul 2016 11:39:10 +0000 (11:39 +0000)]
Merge pull request #6982 from tfauck:master
Thierry Fauck [Mon, 25 Jul 2016 09:30:50 +0000 (11:30 +0200)]
Non existent definition of _FPU_EXTENDED definition prevent compilation when WITH_CUDA set
Non existence of _FPU_EXTENDED definition on powerpc64 (like it is for apple and arm)
prevent compilation when WITH_CUDA is set. Adding powerpc64 as case to not use these
definitions
modifié: modules/cudalegacy/test/TestHaarCascadeApplication.cpp
modifié: modules/cudalegacy/test/test_precomp.hpp
Signed-off-by: Thierry Fauck <tfauck@free.fr>
Alexander Alekhin [Mon, 25 Jul 2016 08:09:18 +0000 (08:09 +0000)]
Merge pull request #6980 from tomoaki0705:fixNanUndeclared2
Tomoaki Teshima [Sun, 24 Jul 2016 23:27:52 +0000 (08:27 +0900)]
fix build error
* NAN is not defined on some platform
* follow the comment on PR
Alexander Alekhin [Sun, 24 Jul 2016 16:53:01 +0000 (16:53 +0000)]
Merge pull request #6975 from tomoaki0705:fixNanUndeclared
Tomoaki Teshima [Sun, 24 Jul 2016 14:34:12 +0000 (23:34 +0900)]
follow the comment
* test build on VS2012
Alexander Alekhin [Sun, 24 Jul 2016 10:11:39 +0000 (10:11 +0000)]
Merge pull request #6976 from theg4sh:linux-window-mouse-wheel-support