Vadim Pisarevsky [Tue, 26 May 2015 07:46:03 +0000 (07:46 +0000)]
Merge pull request #4054 from gongzg:master
Zhigang Gong [Tue, 26 May 2015 00:13:23 +0000 (08:13 +0800)]
Avoid negative index for a local buffer in Canny.cl.
int pix_per_thr = l_counter / LOCAL_TOTAL + ((lid < mod) ? 1 : 0);
The pix_per_thr * LOCAL_TOTAL may be larger than l_counter.
Thus the index of l_stack may be negative which may cause serious
problems. Let's skip the loop when we get negative index and we need
to add back the lcounter to keep its balance and avoid potential
negative counter.
Signed-off-by: Zhigang Gong <zhigang.gong@intel.com>
Vadim Pisarevsky [Mon, 25 May 2015 17:06:50 +0000 (17:06 +0000)]
Merge pull request #4049 from mshabunin:transition-hint
Maksim Shabunin [Mon, 25 May 2015 15:05:20 +0000 (18:05 +0300)]
Transition guide: removed one of the version check methods
Vadim Pisarevsky [Mon, 25 May 2015 13:09:27 +0000 (13:09 +0000)]
Merge pull request #4015 from GilLevi:AddingLATCH
Vadim Pisarevsky [Mon, 25 May 2015 13:07:34 +0000 (13:07 +0000)]
Merge pull request #4052 from ilya-lavrenov:typo
Vadim Pisarevsky [Mon, 25 May 2015 13:06:37 +0000 (13:06 +0000)]
Merge pull request #4051 from Dikay900:2_4_to_master_2
Ilya Lavrenov [Mon, 25 May 2015 08:21:02 +0000 (11:21 +0300)]
typo
GilLevi [Sun, 24 May 2015 22:28:05 +0000 (01:28 +0300)]
fixed whitespace issue
Andreas Stührk [Sat, 18 Oct 2014 23:22:04 +0000 (01:22 +0200)]
TIFF loader: Allocate large enough buffer when (bpp * ncn) > 8.
Conflicts:
modules/highgui/src/grfmt_tiff.cpp
floodfill return value removed
Vladislav Vinogradov [Fri, 17 Oct 2014 09:23:23 +0000 (13:23 +0400)]
fix installation layout for debian packages:
Install symlinks to shared libraries as a part of development package,
not runtime package.
It is default behavior for debian packages.
Ilya Lavrenov [Mon, 6 Oct 2014 07:56:30 +0000 (07:56 +0000)]
TCP instead of UDP
Conflicts:
modules/highgui/src/cap_ffmpeg_impl.hpp
Andreas Stührk [Wed, 8 Oct 2014 21:31:30 +0000 (23:31 +0200)]
Don't allocate lots of memory when reading TIFFs with infinite rows per strip.
Some TIFF images consist of only one strip. The magic value 2**32-1 for the
"rows per strip" tag reflects that fact, effectively meaning "infinite".
Conflicts:
modules/highgui/src/grfmt_tiff.cpp
modules/highgui/test/test_grfmt.cpp
fix whitespace
fix compile error
Niklas Frisk [Tue, 7 Oct 2014 07:40:56 +0000 (09:40 +0200)]
Fixes #3910, flags in _prepareImgAndDrawKeypoints are now binary OR'ed instead of added.
Conflicts:
modules/features2d/src/draw.cpp
Alexander Smorkalov [Wed, 1 Oct 2014 05:13:35 +0000 (09:13 +0400)]
Turn off superres accuracy tests if video i/o is not supported.
Alexander Smorkalov [Tue, 30 Sep 2014 10:34:00 +0000 (14:34 +0400)]
Test fisheye.rectify disabled for Tegra.
jormansa [Mon, 15 Sep 2014 16:09:44 +0000 (18:09 +0200)]
bug fixed
Conflicts:
modules/highgui/src/cap_ffmpeg_impl.hpp
StevenPuttemans [Mon, 18 Aug 2014 11:33:40 +0000 (13:33 +0200)]
fixing GT and GE comparison symbol
Conflicts:
modules/gpu/doc/per_element_operations.rst
Alexander Smorkalov [Wed, 13 Aug 2014 09:46:43 +0000 (13:46 +0400)]
GCC 4.8 warning array subscript is above array bounds fixed.
tiff test fixed
Alexander Smorkalov [Mon, 14 Jul 2014 17:27:23 +0000 (21:27 +0400)]
Deb package build fix for CUDA 6.5 and newer.
(cherry picked from commit
e650d87e470b2e6a8f87ad4dd81977748a136aee)
(cherry picked from commit
ca9c52ac9778d01eba933a786b4303c79d0162be)
Conflicts:
cmake/OpenCVPackaging.cmake
Martijn Liem [Wed, 23 Jul 2014 10:33:51 +0000 (12:33 +0200)]
Bugfix for bug #3767
Fixed a memory leak in cap_dshow.cpp in videoInput::setVideoSettingCamera(). The leak was caused by not releasing an IBaseFilter object created in a call to getDevice(). Tho object is now properly released.
Conflicts:
modules/highgui/src/cap_dshow.cpp
Vadim Pisarevsky [Sun, 24 May 2015 09:30:46 +0000 (09:30 +0000)]
Merge pull request #4050 from Dikay900:2_4_to_master
Ruslan Baratov [Sat, 12 Jul 2014 15:35:22 +0000 (19:35 +0400)]
Doc: fix definition of macro CV_MAKETYPE
At least this is how it's defined in core/types_c.h
Conflicts:
modules/core/doc/intro.rst
Leonid Beynenson [Fri, 11 Jul 2014 11:47:41 +0000 (15:47 +0400)]
Fixed bug in cv::detail::waveCorrect
The function makes wave correction of a stitched panorama.
Earlier it gave wrong results for panorama made from 1 frame.
Camille [Wed, 9 Jul 2014 20:35:56 +0000 (22:35 +0200)]
bug fix 3696
Mike Maraya [Sat, 28 Jun 2014 03:26:09 +0000 (23:26 -0400)]
Fixes resizeWindow() on OS X (Bug #3200)
Dikay900 [Sat, 23 May 2015 13:26:18 +0000 (15:26 +0200)]
typos in comments
Aleksandr Petrikov [Wed, 4 Jun 2014 08:06:33 +0000 (12:06 +0400)]
add NEON realization for StereoBM(findCorrespondence, prefilterXSobel)
Conflicts:
modules/calib3d/src/stereobm.cpp
Add CV_Assert (ndisp % 8 == 0) to NEON version
Ehren Metcalfe [Sat, 31 May 2014 23:41:16 +0000 (19:41 -0400)]
Fix resource leak with iOS camera due to failure to remove AVCaptureSession input/outputs on stop (Bug #3389)
Conflicts:
modules/highgui/src/cap_ios_abstract_camera.mm
aletheios [Sat, 31 May 2014 16:44:32 +0000 (18:44 +0200)]
Bugfix #3705: params.setRecordingHint(true) breaks camera preview on Samsung Galaxy S2
Jüri Aedla [Thu, 1 May 2014 12:37:12 +0000 (15:37 +0300)]
Android camera qcom HAL doesn't like it when no consumer usage bits are set. Set a usage bit for preview BufferQueue.
Alexander Smorkalov [Wed, 2 Apr 2014 01:00:44 +0000 (18:00 -0700)]
Bug #3611 Initializing static cv::Mat with cv::Mat::zeros causes segmentation fault fixed.
fix MatOpInitializer
Vadim Pisarevsky [Sat, 23 May 2015 10:17:39 +0000 (10:17 +0000)]
Merge pull request #4010 from cr333:triangulation_fix_master
Vadim Pisarevsky [Sat, 23 May 2015 09:02:10 +0000 (09:02 +0000)]
Merge pull request #4047 from MSOpenTech:videoio-refactor-contrib
Vadim Pisarevsky [Fri, 22 May 2015 21:19:03 +0000 (21:19 +0000)]
Merge pull request #4048 from vpisarev:hal_fixes
Maksim Shabunin [Fri, 22 May 2015 14:55:08 +0000 (17:55 +0300)]
Transition guide: how to check library version
Vadim Pisarevsky [Fri, 22 May 2015 13:53:34 +0000 (16:53 +0300)]
trying to eliminate warnings in Android build
Vadim Pisarevsky [Fri, 22 May 2015 13:21:36 +0000 (13:21 +0000)]
Merge pull request #4016 from vladimir-dudnik:directx-opencl-sample
Vadim Pisarevsky [Fri, 22 May 2015 13:04:10 +0000 (16:04 +0300)]
removed HAL calls from public OpenCV headers; put IPP calls back to hall:sqrt() and such (but they are disabled for now)
Maxim Kostin [Mon, 18 May 2015 12:21:49 +0000 (15:21 +0300)]
Refactored internal helpers. Simplified structure. Updated comments. Updates #41
Signed-off-by: Maxim Kostin <v-maxkos@microsoft.com>
Vladimir Dudnik [Fri, 22 May 2015 11:12:00 +0000 (14:12 +0300)]
short description moved to the beginning of file
Vadim Pisarevsky [Thu, 21 May 2015 19:16:27 +0000 (19:16 +0000)]
Merge pull request #4025 from vpisarev:features2d_fixes
Vadim Pisarevsky [Thu, 21 May 2015 14:10:35 +0000 (17:10 +0300)]
another attempt to make the MSER test pass. removed possible randomization in parameters from run to run
Vladimir Dudnik [Thu, 21 May 2015 14:08:13 +0000 (17:08 +0300)]
add short description
Vadim Pisarevsky [Thu, 21 May 2015 13:27:34 +0000 (16:27 +0300)]
fixed failure in Features2d_MSER.cases
Vadim Pisarevsky [Thu, 21 May 2015 13:19:21 +0000 (13:19 +0000)]
Merge pull request #4040 from dobrypd:libgphoto2-connection
Vadim Pisarevsky [Thu, 21 May 2015 12:35:17 +0000 (12:35 +0000)]
Merge pull request #4027 from zenev:master
Vadim Pisarevsky [Thu, 21 May 2015 12:31:48 +0000 (12:31 +0000)]
Merge pull request #4031 from apavlenko:revert_4014
Vadim Pisarevsky [Thu, 21 May 2015 12:03:17 +0000 (15:03 +0300)]
added reasonable test for MSER (including coverage for code.opencv.org/issues/4273, http://code.opencv.org/issues/1723 and http://code.opencv.org/issues/756); also, added some "in-progress" info to the Features2d_Feature2d.no_crash test.
Vadim Pisarevsky [Thu, 21 May 2015 02:44:14 +0000 (05:44 +0300)]
it's now true MSER algorithm that works well on binary images too
Piotr Dobrowolski [Wed, 20 May 2015 22:41:39 +0000 (00:41 +0200)]
VideoCapture with digital camera and gPhoto2 library
GilLevi [Wed, 20 May 2015 21:04:24 +0000 (00:04 +0300)]
renamed LATCH
Vadim Pisarevsky [Wed, 20 May 2015 09:58:47 +0000 (09:58 +0000)]
Merge pull request #4026 from mshabunin:install-cvconfig
Andrey Pavlenko [Tue, 19 May 2015 15:52:59 +0000 (18:52 +0300)]
Revert of "Merge pull request #4006 from sgjava:opencv-steve" (reverted from commit
4743184078659d4bcf43c363efd2aa430e4786ff)
Vladimir Dudnik [Tue, 19 May 2015 13:08:25 +0000 (16:08 +0300)]
replaced macros with template func
Andrey Pavlenko [Tue, 19 May 2015 10:28:32 +0000 (13:28 +0300)]
Revert of "Merge pull request #4014 from sgjava:opencv-sgjava" (reverted from commit
52fa55a770cb07a6401aa6617b81f413d1165771)
zenev [Mon, 18 May 2015 20:29:54 +0000 (13:29 -0700)]
Merge branch 'master' of https://github.com/zenev/opencv
zenev [Mon, 18 May 2015 20:29:15 +0000 (13:29 -0700)]
fixed vector out of range exception in nextImg
Vadim Pisarevsky [Mon, 18 May 2015 18:16:53 +0000 (21:16 +0300)]
added test to do smoke testing of ORB, KAZE, AKAZE and BRISK on images of different size
Maksim Shabunin [Mon, 18 May 2015 16:19:48 +0000 (19:19 +0300)]
Install cvconfig.h file
Vadim Pisarevsky [Mon, 18 May 2015 16:01:00 +0000 (19:01 +0300)]
added test for batch detection/descriptor extraction (code.opencv.org/issues/3943)
Vadim Pisarevsky [Mon, 18 May 2015 15:59:37 +0000 (18:59 +0300)]
added read/write functions for vector<DMatch> + the test (code.opencv.org/issues/4308)
Vadim Pisarevsky [Mon, 18 May 2015 14:08:22 +0000 (14:08 +0000)]
Merge pull request #4023 from Dikay900:cleanup_cascadedetect
Vadim Pisarevsky [Mon, 18 May 2015 14:06:37 +0000 (14:06 +0000)]
Merge pull request #4024 from jet47:cuda-minmaxloc-one-row-input
Vladislav Vinogradov [Mon, 18 May 2015 11:16:55 +0000 (14:16 +0300)]
fix #4343 : cv::cuda::findMinMaxLoc incorrect output for single row matrix
Dikay900 [Sun, 17 May 2015 22:31:39 +0000 (00:31 +0200)]
cleanup after last PR
Vadim Pisarevsky [Sun, 17 May 2015 00:28:30 +0000 (00:28 +0000)]
Merge pull request #3971 from Dikay900:2_4_to_master_3
GilLevi [Sat, 16 May 2015 19:37:38 +0000 (22:37 +0300)]
added sample for LATCH
Vadim Pisarevsky [Sat, 16 May 2015 19:11:32 +0000 (19:11 +0000)]
Merge pull request #4011 from cr333:parula
GilLevi [Sat, 16 May 2015 18:15:09 +0000 (21:15 +0300)]
sample for LATCH
Vadim Pisarevsky [Sat, 16 May 2015 18:11:29 +0000 (18:11 +0000)]
Merge pull request #4001 from LaurentBerger:ExampleBLOB
Vadim Pisarevsky [Sat, 16 May 2015 18:08:28 +0000 (18:08 +0000)]
Merge pull request #4005 from MSOpenTech:videoio-contrib
Vladimir Dudnik [Fri, 15 May 2015 21:40:05 +0000 (00:40 +0300)]
removed original samples and replace them with new ones. modified new samples (reduce code duplication, add cmd line params and short description)
Vadim Pisarevsky [Fri, 15 May 2015 16:15:01 +0000 (16:15 +0000)]
Merge pull request #4018 from vpisarev:imgproc_video_fixes
Maxim Kostin [Fri, 15 May 2015 13:29:35 +0000 (16:29 +0300)]
Added sample Windows Universal application (UAP) using videoio logic for video preview and processing.
Signed-off-by: Maxim Kostin <v-maxkos@microsoft.com>
Maxim Kostin [Fri, 15 May 2015 13:29:06 +0000 (16:29 +0300)]
Added configuration changes enabling videoio WinRT support.
Signed-off-by: Maxim Kostin <v-maxkos@microsoft.com>
Maxim Kostin [Fri, 15 May 2015 13:28:47 +0000 (16:28 +0300)]
Added WinRT support for videoio.
Signed-off-by: Maxim Kostin <v-maxkos@microsoft.com>
Maxim Kostin [Fri, 15 May 2015 13:28:25 +0000 (16:28 +0300)]
Moved old WinRT related wrappers from highgui to videoio fixing long broken logic.
Signed-off-by: Maxim Kostin <v-maxkos@microsoft.com>
Vadim Pisarevsky [Fri, 15 May 2015 13:15:10 +0000 (16:15 +0300)]
hopefully, fixed crash in sparse mat test
Vadim Pisarevsky [Fri, 15 May 2015 12:32:45 +0000 (12:32 +0000)]
Merge pull request #3979 from ruslo:fix.cxx11
Vadim Pisarevsky [Fri, 15 May 2015 12:32:27 +0000 (12:32 +0000)]
Merge pull request #3982 from patrikhuber:vs2015-support-master
Vadim Pisarevsky [Fri, 15 May 2015 12:32:05 +0000 (12:32 +0000)]
Merge pull request #3983 from ruslo:unify.ios
Vadim Pisarevsky [Thu, 14 May 2015 21:16:23 +0000 (21:16 +0000)]
Merge pull request #3917 from yanlend:patch-1
Vadim Pisarevsky [Thu, 14 May 2015 20:29:09 +0000 (23:29 +0300)]
significantly reduced sparse matrix footprint:
http://code.opencv.org/issues/2206,
http://code.opencv.org/issues/2924
Vadim Pisarevsky [Thu, 14 May 2015 18:25:15 +0000 (18:25 +0000)]
Merge pull request #4009 from mshabunin:fix-ann-moment
Vadim Pisarevsky [Thu, 14 May 2015 18:24:09 +0000 (18:24 +0000)]
Merge pull request #3992 from nomarek:master
Vadim Pisarevsky [Thu, 14 May 2015 18:23:27 +0000 (18:23 +0000)]
Merge pull request #4014 from sgjava:opencv-sgjava
Vadim Pisarevsky [Thu, 14 May 2015 18:22:26 +0000 (18:22 +0000)]
Merge pull request #4012 from mshabunin:doc-fixes
Vadim Pisarevsky [Thu, 14 May 2015 18:16:23 +0000 (18:16 +0000)]
Merge pull request #4017 from headupinclouds:master
Vadim Pisarevsky [Thu, 14 May 2015 17:33:53 +0000 (20:33 +0300)]
use _mm_sad_epu8 instead of _mm_movemask_epi8 in countNonZero. Therefore, we do not need any popcount table and this solves code.opencv.org/issues/4333
Vadim Pisarevsky [Thu, 14 May 2015 16:54:48 +0000 (19:54 +0300)]
added extra check in CalibrateDebevec to make sure the points are within the image:
http://code.opencv.org/issues/4124
Vadim Pisarevsky [Thu, 14 May 2015 16:32:25 +0000 (19:32 +0300)]
avoid possible problems with zero values in tone mapping algorithms (code.opencv.org/issues/4020)
Vadim Pisarevsky [Thu, 14 May 2015 15:21:26 +0000 (18:21 +0300)]
added test to prove that remap does not leak memory (code.opencv.org/issues/2502). disabled the test for now to save execution time.
Vadim Pisarevsky [Thu, 14 May 2015 13:42:51 +0000 (16:42 +0300)]
fixed compile warnings on Linux and Windows
Vadim Pisarevsky [Thu, 14 May 2015 13:25:18 +0000 (16:25 +0300)]
added test for http://code.opencv.org/issues/2957
Vadim Pisarevsky [Thu, 14 May 2015 12:39:42 +0000 (15:39 +0300)]
significantly improved parallel non-local means by using granularity parameter in parallel_for_ loop. Because the algorithm deals with sliding sums, it's essential that each thread has enough work to do, otherwise the algorithm gets higher theoretical complexity and thus there is no speedup comparing to 1-thread code (at best).
Vladimir Dudnik [Thu, 14 May 2015 09:08:14 +0000 (12:08 +0300)]
fixed new blank line at EOF
Vadim Pisarevsky [Thu, 14 May 2015 07:42:55 +0000 (10:42 +0300)]
increased singularity epsilon in LU decomposition. This solved singular case from code.opencv.org/issues/3305. Added the respective test.
Vadim Pisarevsky [Thu, 14 May 2015 05:06:46 +0000 (08:06 +0300)]
added support for n-channel (n>4) images in warpAffine/warpPerspective/remap: code.opencv.org/issues/4190
David Hirvonen [Wed, 13 May 2015 21:34:16 +0000 (17:34 -0400)]
Avoid clearing HaarEvaluator::tofs variable (introduced
fb8478eb7b6c76f15c106c29a8843d8c3722bb62) in HaarEvaluator::setImage(...) since it won't be recomputed by HaarEvaluator::computeOptFeatures() for cases where the input image dimensions and requested search scales are the same as the previous. If none of the above change then it should be correct, and if they do change it will be computed correctly inside HaarEvaluator::computeOptFeatures() (in commit
952f9dbe629e8e9f310c70c78ed46d484439c1c9)
I'm guessing there is a unit test for this that needs to be called 2x with the same image and search parameters (or another image with the same size) to illustrate the problem.