Alex Leontiev [Sat, 31 Aug 2013 17:02:06 +0000 (01:02 +0800)]
Minor fixes
As the opencv's build-bot did not want to compile this revision, I had
to do some changes. In particular,
1) Removed unsigned int vs int comparisons, that were treated as errors
2) Removed unused variables and functions
3) Removed functions without previous declaration
4) Fixed whitespaces
Alex Leontiev [Mon, 19 Aug 2013 09:19:52 +0000 (17:19 +0800)]
Primal-dual algorithm
This is an implementation of primal-dual algorithm, based on the C++
source code by Vadim Pisarevsky. It was extended to handle the denoising
based on multiple observations. It also contains documentation and
tests.
Roman Donchenko [Mon, 9 Sep 2013 15:53:55 +0000 (19:53 +0400)]
Merge pull request #1381 from 23pointsNorth:master
Roman Donchenko [Mon, 9 Sep 2013 14:10:12 +0000 (18:10 +0400)]
Merge pull request #1282 from nailbiter:optimDS
Roman Donchenko [Mon, 9 Sep 2013 08:27:26 +0000 (12:27 +0400)]
Merge pull request #1408 from jet47:new-ptr-fixes
Roman Donchenko [Mon, 9 Sep 2013 08:05:56 +0000 (12:05 +0400)]
Merge pull request #1403 from lluisgomez:scene_text_detection_NM_fix
Vladislav Vinogradov [Fri, 6 Sep 2013 12:48:13 +0000 (16:48 +0400)]
removed detail:: prefix int video_reader
it conflicts with cv::detail
Vladislav Vinogradov [Mon, 9 Sep 2013 06:57:45 +0000 (10:57 +0400)]
restored original behaviour or release functions for (Buffer and Texture)
lluis [Fri, 6 Sep 2013 17:10:53 +0000 (19:10 +0200)]
changed default parameters in CreateERFiltersNM{1,2} functions. They are not needed now in the sample example.
lluis [Fri, 6 Sep 2013 12:00:11 +0000 (14:00 +0200)]
fixed rebase conflicts
Vladislav Vinogradov [Fri, 6 Sep 2013 11:52:07 +0000 (15:52 +0400)]
fixed compilation issues with new Ptr
Roman Donchenko [Fri, 6 Sep 2013 11:10:05 +0000 (15:10 +0400)]
Merge pull request #1405 from SpecLad:retina-ocl-warn
lluis [Thu, 5 Sep 2013 04:11:01 +0000 (06:11 +0200)]
removed blank line at EOF
lluis [Wed, 4 Sep 2013 19:23:16 +0000 (21:23 +0200)]
removed unnecessary commented block
lluis [Wed, 4 Sep 2013 19:19:43 +0000 (21:19 +0200)]
removed trailing whitespaces
lluis [Wed, 4 Sep 2013 18:25:29 +0000 (20:25 +0200)]
better parameter settings for the ERFilter sample
lluis [Wed, 4 Sep 2013 18:23:37 +0000 (20:23 +0200)]
better classifiers performance by training them with a new dataset of "manually" selected regions
lluis [Wed, 4 Sep 2013 18:22:05 +0000 (20:22 +0200)]
fixed a bug in the calculation of the number of inflexion points feature
lluis [Wed, 4 Sep 2013 18:20:25 +0000 (20:20 +0200)]
fixed a typo error in the default min_Probability param of CreateERFilterNM2
lluis [Wed, 4 Sep 2013 18:19:13 +0000 (20:19 +0200)]
fixed a bug in the non-max-suppression filter procedure
Roman Donchenko [Fri, 6 Sep 2013 08:29:29 +0000 (12:29 +0400)]
retina_ocl.cpp: removed two unused arrays.
Roman Donchenko [Fri, 6 Sep 2013 08:28:59 +0000 (12:28 +0400)]
retina_ocl.hpp: switched BasicRetinaFilter's members around to fix a -Wreorder warning.
Roman Donchenko [Fri, 6 Sep 2013 07:53:33 +0000 (11:53 +0400)]
Merge pull request #1281 from SpecLad:the-smartest-pointer
Roman Donchenko [Thu, 5 Sep 2013 10:53:21 +0000 (14:53 +0400)]
Added tests for Ptr.
Roman Donchenko [Thu, 15 Aug 2013 15:54:00 +0000 (19:54 +0400)]
Fixed some dubious uses of tbb::task_scheduler_init.
Roman Donchenko [Thu, 15 Aug 2013 10:44:25 +0000 (14:44 +0400)]
Rewrote the documentation for Ptr to fit the new implementation.
Roman Donchenko [Wed, 14 Aug 2013 08:44:58 +0000 (12:44 +0400)]
Made Filestorage able to not own its CvFileStorage instance.
This allows to get rid of the last remaining Ptr<T>::addref calls.
Roman Donchenko [Wed, 14 Aug 2013 08:44:11 +0000 (12:44 +0400)]
Replaced calls to Ptr<T>::ptr to ::dynamicCast.
Roman Donchenko [Wed, 14 Aug 2013 08:41:58 +0000 (12:41 +0400)]
Added to CV_INIT_ALGORITHM a Ptr creation function, for convenience.
Also changed the static functions to inline, to stop GCC complaining
about unused functions.
Roman Donchenko [Wed, 14 Aug 2013 08:32:41 +0000 (12:32 +0400)]
Adapt Python bindings to the new Ptr.
Roman Donchenko [Tue, 13 Aug 2013 15:12:25 +0000 (19:12 +0400)]
Java: removed usages of Ptr<T>::addref().
Now the features2d class wrappers use composition instead of inheritance.
Roman Donchenko [Tue, 13 Aug 2013 14:52:06 +0000 (18:52 +0400)]
Replace an incorrect usage of Ptr with a simple vector.
Roman Donchenko [Tue, 13 Aug 2013 14:49:29 +0000 (18:49 +0400)]
Boring changes - samples.
Roman Donchenko [Tue, 13 Aug 2013 14:33:06 +0000 (18:33 +0400)]
Boring changes - apps.
Roman Donchenko [Tue, 13 Aug 2013 14:29:36 +0000 (18:29 +0400)]
Boring changes - legacy.
Roman Donchenko [Tue, 13 Aug 2013 14:24:30 +0000 (18:24 +0400)]
Boring changes - contrib.
Roman Donchenko [Tue, 13 Aug 2013 14:18:38 +0000 (18:18 +0400)]
Boring changes - ocl.
Roman Donchenko [Tue, 13 Aug 2013 14:58:46 +0000 (18:58 +0400)]
Boring changes - gpuwarping.
Roman Donchenko [Tue, 13 Aug 2013 14:17:21 +0000 (18:17 +0400)]
Boring changes - gpustereo.
Roman Donchenko [Tue, 13 Aug 2013 14:16:41 +0000 (18:16 +0400)]
Boring changes - gpulegacy.
Roman Donchenko [Tue, 13 Aug 2013 14:15:02 +0000 (18:15 +0400)]
Boring changes - gpuimgproc.
Roman Donchenko [Tue, 13 Aug 2013 14:10:26 +0000 (18:10 +0400)]
Boring changes - gpufilters.
Roman Donchenko [Tue, 13 Aug 2013 14:06:39 +0000 (18:06 +0400)]
Boring changes - gpucodec.
Roman Donchenko [Tue, 13 Aug 2013 14:05:11 +0000 (18:05 +0400)]
Boring changes - gpubgsegm.
Roman Donchenko [Tue, 13 Aug 2013 14:03:48 +0000 (18:03 +0400)]
Boring changes - gpuarithm.
Roman Donchenko [Tue, 13 Aug 2013 14:03:13 +0000 (18:03 +0400)]
Boring changes - gpu.
Roman Donchenko [Tue, 13 Aug 2013 14:01:59 +0000 (18:01 +0400)]
Boring changes - videostab.
Roman Donchenko [Tue, 13 Aug 2013 13:57:49 +0000 (17:57 +0400)]
Boring changes - video.
Roman Donchenko [Tue, 13 Aug 2013 13:57:06 +0000 (17:57 +0400)]
Boring changes - superres.
Roman Donchenko [Tue, 13 Aug 2013 13:54:12 +0000 (17:54 +0400)]
Boring changes - stitching.
Roman Donchenko [Tue, 13 Aug 2013 13:48:37 +0000 (17:48 +0400)]
Boring changes - softcascade.
Roman Donchenko [Tue, 13 Aug 2013 13:46:40 +0000 (17:46 +0400)]
Boring changes - photo.
Roman Donchenko [Tue, 13 Aug 2013 13:45:29 +0000 (17:45 +0400)]
Boring changes - objdetect.
Roman Donchenko [Tue, 13 Aug 2013 13:36:38 +0000 (17:36 +0400)]
Boring changes - nonfree.
Roman Donchenko [Tue, 13 Aug 2013 13:35:25 +0000 (17:35 +0400)]
Boring changes - ml.
Roman Donchenko [Tue, 13 Aug 2013 13:30:14 +0000 (17:30 +0400)]
Boring changes - features2d.
Roman Donchenko [Tue, 13 Aug 2013 13:03:56 +0000 (17:03 +0400)]
Boring changes - calib3d.
Roman Donchenko [Tue, 13 Aug 2013 12:48:54 +0000 (16:48 +0400)]
Boring changes - bioinspired.
Roman Donchenko [Tue, 13 Aug 2013 12:47:18 +0000 (16:47 +0400)]
Boring changes - highgui.
Roman Donchenko [Tue, 13 Aug 2013 12:39:58 +0000 (16:39 +0400)]
Boring changes - imgproc.
Roman Donchenko [Tue, 13 Aug 2013 12:22:07 +0000 (16:22 +0400)]
Boring changes - core.
This and several following commits contain the "boring" changes required
to support the new Ptr. These are changes like:
* new T -> makePtr<T> or .reset(new T) or Ptr<T>(new T)
(depending on the situation)
* p.empty() -> !p
* delete_obj -> DefaultDeleter::operator()
and similar changes that are numerous, but primitive.
Roman Donchenko [Tue, 13 Aug 2013 11:18:07 +0000 (15:18 +0400)]
Replaced Ptr with my new implementation.
Roman Donchenko [Thu, 5 Sep 2013 07:57:44 +0000 (11:57 +0400)]
Merge pull request #1399 from pengx17:master_retina_ocl_fix
Daniel Angelov [Wed, 4 Sep 2013 21:02:24 +0000 (00:02 +0300)]
Update on the compare lines method.
Daniel Angelov [Wed, 4 Sep 2013 11:59:57 +0000 (14:59 +0300)]
Removed IOArray constness.
pengxiao [Wed, 4 Sep 2013 08:38:36 +0000 (16:38 +0800)]
Fix a bug of ocl retina on NVIDIA platform.
Roman Donchenko [Wed, 4 Sep 2013 07:53:32 +0000 (11:53 +0400)]
Merge pull request #1373 from abidrahmank:pykeypoints
Roman Donchenko [Tue, 3 Sep 2013 15:42:05 +0000 (19:42 +0400)]
Merge pull request #1389 from SpecLad:merge-2.4
Abid K [Tue, 3 Sep 2013 15:42:03 +0000 (21:12 +0530)]
alignment of parameters as per speclad
Roman Donchenko [Tue, 3 Sep 2013 14:43:54 +0000 (18:43 +0400)]
Merge pull request #1224 from mbarnach:pca_io
Roman Donchenko [Mon, 2 Sep 2013 15:53:45 +0000 (19:53 +0400)]
Nuked the rest of the precomp.cpp files.
Consider this a part of merging #1357.
Roman Donchenko [Mon, 2 Sep 2013 15:44:51 +0000 (19:44 +0400)]
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
modules/contrib/src/retina.cpp
modules/gpu/perf/perf_video.cpp
modules/gpuoptflow/src/tvl1flow.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_calib3d.cpp
modules/ocl/perf/perf_color.cpp
modules/ocl/perf/perf_match_template.cpp
modules/ocl/src/precomp.hpp
samples/gpu/stereo_multi.cpp
Roman Donchenko [Mon, 2 Sep 2013 12:05:14 +0000 (16:05 +0400)]
Merge pull request #1385 from asmorkalov:winrt_glob_fix
Alexander Smorkalov [Mon, 2 Sep 2013 07:57:42 +0000 (00:57 -0700)]
Globbing accuracy test fail on Windows RT fixed.
Roman Donchenko [Mon, 2 Sep 2013 11:11:19 +0000 (15:11 +0400)]
Merge pull request #1302 from kdrobnyh:compare
Roman Donchenko [Mon, 2 Sep 2013 10:10:05 +0000 (14:10 +0400)]
Merge pull request #1355 from jet47:gpu-stereo-multi-gpu-sample
Roman Donchenko [Mon, 2 Sep 2013 09:09:22 +0000 (13:09 +0400)]
Merge pull request #1345 from pengx17:2.4_tvl1ocl_opt
Daniel Angelov [Sat, 31 Aug 2013 10:46:10 +0000 (13:46 +0300)]
Added LineSegmentDetector documentation and an output image.
Daniel Angelov [Sat, 31 Aug 2013 10:39:38 +0000 (13:39 +0300)]
Update on LSD no to use any Mat* (IOArrays instead).
Updated to new license.
Roman Donchenko [Fri, 30 Aug 2013 13:56:06 +0000 (17:56 +0400)]
Merge pull request #1371 from HapeMask:fix-png-warnings
Roman Donchenko [Fri, 30 Aug 2013 13:55:07 +0000 (17:55 +0400)]
Merge pull request #1360 from vpisarev:24_ipp_dft_canny_morphrect
Gabe Schwartz [Thu, 29 Aug 2013 18:32:50 +0000 (14:32 -0400)]
Added interlace handling to PNG decoder.
libpng 1.5+ recommends a call to png_set_interlace_handling() if you use
png_read_update_info and png_read_image. It will generate a warning
without it.
Gabe Schwartz [Tue, 27 Aug 2013 20:28:10 +0000 (16:28 -0400)]
Removed incorrect iCCP chunks from GUI resources.
Also removed malformed tEXt chunk from a logo PNG.
Alex Leontiev [Tue, 27 Aug 2013 16:27:59 +0000 (00:27 +0800)]
Minor fixes
In response to the pull request comments by Vadim Pisarevsky. In
particular, the following was done:
*)cv::reduce use instead of custom code for calculating
per-coordinate sum
*) naming style of private methods is made consisted with overall --
mixed-case style
*) irrelevant create()'s were removed -- I did not know that copyTo()
method itself calls create
Alex Leontiev [Wed, 21 Aug 2013 10:16:37 +0000 (18:16 +0800)]
Fixed .rst indentation
This caused warnings.
Alex Leontiev [Wed, 21 Aug 2013 09:23:40 +0000 (17:23 +0800)]
Removed trailing spaces
Continuation of work done in previous commit.
Alex Leontiev [Tue, 20 Aug 2013 09:54:14 +0000 (17:54 +0800)]
Removed trailing spaces
This caused warnings.
Alex Leontiev [Thu, 1 Aug 2013 12:42:59 +0000 (20:42 +0800)]
Prepare Downhill Simplex for pull request
This is an implementation of so-called downhill simplex method
(https://en.wikipedia.org/wiki/Nelder%E2%80%93Mead_method)
Please, let me know if you have any comments, whoever you'd be.
Roman Donchenko [Fri, 30 Aug 2013 13:28:51 +0000 (17:28 +0400)]
Merge pull request #1374 from zacstewart:2.4
Roman Donchenko [Fri, 30 Aug 2013 13:26:20 +0000 (17:26 +0400)]
Merge pull request #1266 from kdrobnyh:core_stat_functions
Roman Donchenko [Fri, 30 Aug 2013 13:25:06 +0000 (17:25 +0400)]
Merge pull request #1236 from pengx17:2.4_fix_retina_color_param
Zac Stewart [Fri, 30 Aug 2013 10:34:47 +0000 (06:34 -0400)]
Correct name of eye function
Zac Stewart [Fri, 30 Aug 2013 10:34:23 +0000 (06:34 -0400)]
Remove extraneous colon before ':basicstructures:'
abidrahmank [Fri, 30 Aug 2013 10:28:10 +0000 (15:58 +0530)]
warning corrections
Roman Donchenko [Fri, 30 Aug 2013 08:24:24 +0000 (12:24 +0400)]
Merge pull request #1363 from ilya-lavrenov:ocl_enable_tests
Roman Donchenko [Fri, 30 Aug 2013 08:21:26 +0000 (12:21 +0400)]
Merge pull request #1370 from ilya-lavrenov:ocl_decor
abidrahmank [Fri, 30 Aug 2013 05:41:06 +0000 (11:11 +0530)]
Python bindings for KeyPoint methods
Usage:
import numpy as np
import cv2
img = cv2.imread('messi5.jpg',0)
sift = cv2.SIFT()
kp = sift.detect(img)
pts = cv2.KeyPoint_convert(kp)
kps = cv2.KeyPoint_convert(pts.reshape(-1,1,2))
overlap = cv2.KeyPoint_overlap(kp[0],kp[1])
kdrobnyh [Thu, 29 Aug 2013 17:05:35 +0000 (21:05 +0400)]
Add IPP support in meanStdDev, minMaxIdx, norm functions
kdrobnyh [Thu, 29 Aug 2013 14:53:46 +0000 (07:53 -0700)]
Merge pull request #5 from Itseez/2.4
Some changes in OpenCV
ilya-lavrenov [Wed, 28 Aug 2013 07:25:54 +0000 (11:25 +0400)]
enabled some tests that failed before OCL_TEST_CYCLE*() macroses were defined and for some tests was disabled SANITY_CHECK, because plain and ocl results must not be completely equal