platform/upstream/opencv.git
11 years ago- Wrote the documentation for the minEnclosingTriangle function (+1 extra picture...
Ovidiu Parvu [Sun, 15 Sep 2013 14:07:17 +0000 (15:07 +0100)]
- Wrote the documentation for the minEnclosingTriangle function (+1 extra picture depicting a sample output)

11 years agoOverloaded the minEnclosingTriangle function such that there is an alternative functi...
Ovidiu Parvu [Thu, 12 Sep 2013 22:47:48 +0000 (23:47 +0100)]
Overloaded the minEnclosingTriangle function such that there is an alternative function with the same name which does not require the output parameter ``area''.
Changed the sample source file minarea.cpp to use the overloaded version of the function.
Updated some comments in the min_enclosing_triangle.cpp source file.

11 years agoOptimised one assert statement in the min_enclosing_triangle.cpp file. Added the...
Ovidiu Parvu [Thu, 12 Sep 2013 14:01:21 +0000 (15:01 +0100)]
Optimised one assert statement in the min_enclosing_triangle.cpp file. Added the minEnclosingTriangle functionality to the existing minarea.cpp sample file.

11 years agoAdded some assert statements to constrain the type of the input and output parameters...
Ovidiu Parvu [Thu, 12 Sep 2013 13:34:08 +0000 (14:34 +0100)]
Added some assert statements to constrain the type of the input and output parameters. Convert the input set of points to vector<Point2f> before passing it to the findMinimumAreaEnclosingTriangle function.

11 years agoChanged the semantics of the minEnclosingTriangle function such that:
Ovidiu Parvu [Thu, 12 Sep 2013 12:29:10 +0000 (13:29 +0100)]
Changed the semantics of the minEnclosingTriangle function such that:

1. The function receives a set of points as input instead of a convex polygon with more than three vertices
2. The convex hull P is computed inside the function
3.1. If the number of vertices of P is greater than three then the algorithm which was implemented before executes
3.2. Otherwise the vertices of the triangle are picked from the vertices of the given polygon and the area computed

11 years ago- Changed the type of the minEnclosingTriangle function parameters by using proxy...
Ovidiu Parvu [Thu, 12 Sep 2013 09:11:38 +0000 (10:11 +0100)]
- Changed the type of the minEnclosingTriangle function parameters by using proxy classes InputArray/OutputArray instead of std::vector<T>
- Adapted the source code to accommodate this change

11 years ago- Added the minEnclosingTriangle function declaration to the imgproc header
Ovidiu Parvu [Wed, 11 Sep 2013 17:02:10 +0000 (18:02 +0100)]
- Added the minEnclosingTriangle function declaration to the imgproc header
- Added the source code for the function in the separate file min_enclosing_triangle.cpp

11 years agoMerge pull request #1408 from jet47:new-ptr-fixes
Roman Donchenko [Mon, 9 Sep 2013 08:27:26 +0000 (12:27 +0400)]
Merge pull request #1408 from jet47:new-ptr-fixes

11 years agoMerge pull request #1403 from lluisgomez:scene_text_detection_NM_fix
Roman Donchenko [Mon, 9 Sep 2013 08:05:56 +0000 (12:05 +0400)]
Merge pull request #1403 from lluisgomez:scene_text_detection_NM_fix

11 years agoremoved detail:: prefix int video_reader
Vladislav Vinogradov [Fri, 6 Sep 2013 12:48:13 +0000 (16:48 +0400)]
removed detail:: prefix int video_reader

it conflicts with cv::detail

11 years agorestored original behaviour or release functions for (Buffer and Texture)
Vladislav Vinogradov [Mon, 9 Sep 2013 06:57:45 +0000 (10:57 +0400)]
restored original behaviour or release functions for (Buffer and Texture)

11 years agochanged default parameters in CreateERFiltersNM{1,2} functions. They are not needed...
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.

11 years agofixed rebase conflicts
lluis [Fri, 6 Sep 2013 12:00:11 +0000 (14:00 +0200)]
fixed rebase conflicts

11 years agofixed compilation issues with new Ptr
Vladislav Vinogradov [Fri, 6 Sep 2013 11:52:07 +0000 (15:52 +0400)]
fixed compilation issues with new Ptr

11 years agoMerge pull request #1405 from SpecLad:retina-ocl-warn
Roman Donchenko [Fri, 6 Sep 2013 11:10:05 +0000 (15:10 +0400)]
Merge pull request #1405 from SpecLad:retina-ocl-warn

11 years agoremoved blank line at EOF
lluis [Thu, 5 Sep 2013 04:11:01 +0000 (06:11 +0200)]
removed blank line at EOF

11 years agoremoved unnecessary commented block
lluis [Wed, 4 Sep 2013 19:23:16 +0000 (21:23 +0200)]
removed unnecessary commented block

11 years agoremoved trailing whitespaces
lluis [Wed, 4 Sep 2013 19:19:43 +0000 (21:19 +0200)]
removed trailing whitespaces

11 years agobetter parameter settings for the ERFilter sample
lluis [Wed, 4 Sep 2013 18:25:29 +0000 (20:25 +0200)]
better parameter settings for the ERFilter sample

11 years agobetter classifiers performance by training them with a new dataset of "manually"...
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

11 years agofixed a bug in the calculation of the number of inflexion points feature
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

11 years agofixed a typo error in the default min_Probability param of CreateERFilterNM2
lluis [Wed, 4 Sep 2013 18:20:25 +0000 (20:20 +0200)]
fixed a typo error in the default min_Probability param of CreateERFilterNM2

11 years agofixed a bug in the non-max-suppression filter procedure
lluis [Wed, 4 Sep 2013 18:19:13 +0000 (20:19 +0200)]
fixed a bug in the non-max-suppression filter procedure

11 years agoretina_ocl.cpp: removed two unused arrays.
Roman Donchenko [Fri, 6 Sep 2013 08:29:29 +0000 (12:29 +0400)]
retina_ocl.cpp: removed two unused arrays.

11 years agoretina_ocl.hpp: switched BasicRetinaFilter's members around to fix a -Wreorder warning.
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.

11 years agoMerge pull request #1281 from SpecLad:the-smartest-pointer
Roman Donchenko [Fri, 6 Sep 2013 07:53:33 +0000 (11:53 +0400)]
Merge pull request #1281 from SpecLad:the-smartest-pointer

11 years agoAdded tests for Ptr.
Roman Donchenko [Thu, 5 Sep 2013 10:53:21 +0000 (14:53 +0400)]
Added tests for Ptr.

11 years agoFixed some dubious uses of tbb::task_scheduler_init.
Roman Donchenko [Thu, 15 Aug 2013 15:54:00 +0000 (19:54 +0400)]
Fixed some dubious uses of tbb::task_scheduler_init.

11 years agoRewrote the documentation for Ptr to fit the new implementation.
Roman Donchenko [Thu, 15 Aug 2013 10:44:25 +0000 (14:44 +0400)]
Rewrote the documentation for Ptr to fit the new implementation.

11 years agoMade Filestorage able to not own its CvFileStorage instance.
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.

11 years agoReplaced calls to Ptr<T>::ptr to ::dynamicCast.
Roman Donchenko [Wed, 14 Aug 2013 08:44:11 +0000 (12:44 +0400)]
Replaced calls to Ptr<T>::ptr to ::dynamicCast.

11 years agoAdded to CV_INIT_ALGORITHM a Ptr creation function, for convenience.
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.

11 years agoAdapt Python bindings to the new Ptr.
Roman Donchenko [Wed, 14 Aug 2013 08:32:41 +0000 (12:32 +0400)]
Adapt Python bindings to the new Ptr.

11 years agoJava: removed usages of Ptr<T>::addref().
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.

11 years agoReplace an incorrect usage of Ptr with a simple vector.
Roman Donchenko [Tue, 13 Aug 2013 14:52:06 +0000 (18:52 +0400)]
Replace an incorrect usage of Ptr with a simple vector.

11 years agoBoring changes - samples.
Roman Donchenko [Tue, 13 Aug 2013 14:49:29 +0000 (18:49 +0400)]
Boring changes - samples.

11 years agoBoring changes - apps.
Roman Donchenko [Tue, 13 Aug 2013 14:33:06 +0000 (18:33 +0400)]
Boring changes - apps.

11 years agoBoring changes - legacy.
Roman Donchenko [Tue, 13 Aug 2013 14:29:36 +0000 (18:29 +0400)]
Boring changes - legacy.

11 years agoBoring changes - contrib.
Roman Donchenko [Tue, 13 Aug 2013 14:24:30 +0000 (18:24 +0400)]
Boring changes - contrib.

11 years agoBoring changes - ocl.
Roman Donchenko [Tue, 13 Aug 2013 14:18:38 +0000 (18:18 +0400)]
Boring changes - ocl.

11 years agoBoring changes - gpuwarping.
Roman Donchenko [Tue, 13 Aug 2013 14:58:46 +0000 (18:58 +0400)]
Boring changes - gpuwarping.

11 years agoBoring changes - gpustereo.
Roman Donchenko [Tue, 13 Aug 2013 14:17:21 +0000 (18:17 +0400)]
Boring changes - gpustereo.

11 years agoBoring changes - gpulegacy.
Roman Donchenko [Tue, 13 Aug 2013 14:16:41 +0000 (18:16 +0400)]
Boring changes - gpulegacy.

11 years agoBoring changes - gpuimgproc.
Roman Donchenko [Tue, 13 Aug 2013 14:15:02 +0000 (18:15 +0400)]
Boring changes - gpuimgproc.

11 years agoBoring changes - gpufilters.
Roman Donchenko [Tue, 13 Aug 2013 14:10:26 +0000 (18:10 +0400)]
Boring changes - gpufilters.

11 years agoBoring changes - gpucodec.
Roman Donchenko [Tue, 13 Aug 2013 14:06:39 +0000 (18:06 +0400)]
Boring changes - gpucodec.

11 years agoBoring changes - gpubgsegm.
Roman Donchenko [Tue, 13 Aug 2013 14:05:11 +0000 (18:05 +0400)]
Boring changes - gpubgsegm.

11 years agoBoring changes - gpuarithm.
Roman Donchenko [Tue, 13 Aug 2013 14:03:48 +0000 (18:03 +0400)]
Boring changes - gpuarithm.

11 years agoBoring changes - gpu.
Roman Donchenko [Tue, 13 Aug 2013 14:03:13 +0000 (18:03 +0400)]
Boring changes - gpu.

11 years agoBoring changes - videostab.
Roman Donchenko [Tue, 13 Aug 2013 14:01:59 +0000 (18:01 +0400)]
Boring changes - videostab.

11 years agoBoring changes - video.
Roman Donchenko [Tue, 13 Aug 2013 13:57:49 +0000 (17:57 +0400)]
Boring changes - video.

11 years agoBoring changes - superres.
Roman Donchenko [Tue, 13 Aug 2013 13:57:06 +0000 (17:57 +0400)]
Boring changes - superres.

11 years agoBoring changes - stitching.
Roman Donchenko [Tue, 13 Aug 2013 13:54:12 +0000 (17:54 +0400)]
Boring changes - stitching.

11 years agoBoring changes - softcascade.
Roman Donchenko [Tue, 13 Aug 2013 13:48:37 +0000 (17:48 +0400)]
Boring changes - softcascade.

11 years agoBoring changes - photo.
Roman Donchenko [Tue, 13 Aug 2013 13:46:40 +0000 (17:46 +0400)]
Boring changes - photo.

11 years agoBoring changes - objdetect.
Roman Donchenko [Tue, 13 Aug 2013 13:45:29 +0000 (17:45 +0400)]
Boring changes - objdetect.

11 years agoBoring changes - nonfree.
Roman Donchenko [Tue, 13 Aug 2013 13:36:38 +0000 (17:36 +0400)]
Boring changes - nonfree.

11 years agoBoring changes - ml.
Roman Donchenko [Tue, 13 Aug 2013 13:35:25 +0000 (17:35 +0400)]
Boring changes - ml.

11 years agoBoring changes - features2d.
Roman Donchenko [Tue, 13 Aug 2013 13:30:14 +0000 (17:30 +0400)]
Boring changes - features2d.

11 years agoBoring changes - calib3d.
Roman Donchenko [Tue, 13 Aug 2013 13:03:56 +0000 (17:03 +0400)]
Boring changes - calib3d.

11 years agoBoring changes - bioinspired.
Roman Donchenko [Tue, 13 Aug 2013 12:48:54 +0000 (16:48 +0400)]
Boring changes - bioinspired.

11 years agoBoring changes - highgui.
Roman Donchenko [Tue, 13 Aug 2013 12:47:18 +0000 (16:47 +0400)]
Boring changes - highgui.

11 years agoBoring changes - imgproc.
Roman Donchenko [Tue, 13 Aug 2013 12:39:58 +0000 (16:39 +0400)]
Boring changes - imgproc.

11 years agoBoring changes - core.
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.

11 years agoReplaced Ptr with my new implementation.
Roman Donchenko [Tue, 13 Aug 2013 11:18:07 +0000 (15:18 +0400)]
Replaced Ptr with my new implementation.

11 years agoMerge pull request #1399 from pengx17:master_retina_ocl_fix
Roman Donchenko [Thu, 5 Sep 2013 07:57:44 +0000 (11:57 +0400)]
Merge pull request #1399 from pengx17:master_retina_ocl_fix

11 years agoFix a bug of ocl retina on NVIDIA platform.
pengxiao [Wed, 4 Sep 2013 08:38:36 +0000 (16:38 +0800)]
Fix a bug of ocl retina on NVIDIA platform.

11 years agoMerge pull request #1373 from abidrahmank:pykeypoints
Roman Donchenko [Wed, 4 Sep 2013 07:53:32 +0000 (11:53 +0400)]
Merge pull request #1373 from abidrahmank:pykeypoints

11 years agoMerge pull request #1389 from SpecLad:merge-2.4
Roman Donchenko [Tue, 3 Sep 2013 15:42:05 +0000 (19:42 +0400)]
Merge pull request #1389 from SpecLad:merge-2.4

11 years agoalignment of parameters as per speclad
Abid K [Tue, 3 Sep 2013 15:42:03 +0000 (21:12 +0530)]
alignment of parameters as per speclad

11 years agoMerge pull request #1224 from mbarnach:pca_io
Roman Donchenko [Tue, 3 Sep 2013 14:43:54 +0000 (18:43 +0400)]
Merge pull request #1224 from mbarnach:pca_io

11 years agoNuked the rest of the precomp.cpp files.
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.

11 years agoMerge remote-tracking branch 'origin/2.4' into merge-2.4
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

11 years agoMerge pull request #1385 from asmorkalov:winrt_glob_fix
Roman Donchenko [Mon, 2 Sep 2013 12:05:14 +0000 (16:05 +0400)]
Merge pull request #1385 from asmorkalov:winrt_glob_fix

11 years agoGlobbing accuracy test fail on Windows RT fixed.
Alexander Smorkalov [Mon, 2 Sep 2013 07:57:42 +0000 (00:57 -0700)]
Globbing accuracy test fail on Windows RT fixed.

11 years agoMerge pull request #1302 from kdrobnyh:compare
Roman Donchenko [Mon, 2 Sep 2013 11:11:19 +0000 (15:11 +0400)]
Merge pull request #1302 from kdrobnyh:compare

11 years agoMerge pull request #1355 from jet47:gpu-stereo-multi-gpu-sample
Roman Donchenko [Mon, 2 Sep 2013 10:10:05 +0000 (14:10 +0400)]
Merge pull request #1355 from jet47:gpu-stereo-multi-gpu-sample

11 years agoMerge pull request #1345 from pengx17:2.4_tvl1ocl_opt
Roman Donchenko [Mon, 2 Sep 2013 09:09:22 +0000 (13:09 +0400)]
Merge pull request #1345 from pengx17:2.4_tvl1ocl_opt

11 years agoMerge pull request #1371 from HapeMask:fix-png-warnings
Roman Donchenko [Fri, 30 Aug 2013 13:56:06 +0000 (17:56 +0400)]
Merge pull request #1371 from HapeMask:fix-png-warnings

11 years agoMerge pull request #1360 from vpisarev:24_ipp_dft_canny_morphrect
Roman Donchenko [Fri, 30 Aug 2013 13:55:07 +0000 (17:55 +0400)]
Merge pull request #1360 from vpisarev:24_ipp_dft_canny_morphrect

11 years agoAdded interlace handling to PNG decoder.
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.

11 years agoRemoved incorrect iCCP chunks from GUI resources.
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.

11 years agoMerge pull request #1374 from zacstewart:2.4
Roman Donchenko [Fri, 30 Aug 2013 13:28:51 +0000 (17:28 +0400)]
Merge pull request #1374 from zacstewart:2.4

11 years agoMerge pull request #1266 from kdrobnyh:core_stat_functions
Roman Donchenko [Fri, 30 Aug 2013 13:26:20 +0000 (17:26 +0400)]
Merge pull request #1266 from kdrobnyh:core_stat_functions

11 years agoMerge pull request #1236 from pengx17:2.4_fix_retina_color_param
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

11 years agoCorrect name of eye function
Zac Stewart [Fri, 30 Aug 2013 10:34:47 +0000 (06:34 -0400)]
Correct name of eye function

11 years agoRemove extraneous colon before ':basicstructures:'
Zac Stewart [Fri, 30 Aug 2013 10:34:23 +0000 (06:34 -0400)]
Remove extraneous colon before ':basicstructures:'

11 years agowarning corrections
abidrahmank [Fri, 30 Aug 2013 10:28:10 +0000 (15:58 +0530)]
warning corrections

11 years agoMerge pull request #1363 from ilya-lavrenov:ocl_enable_tests
Roman Donchenko [Fri, 30 Aug 2013 08:24:24 +0000 (12:24 +0400)]
Merge pull request #1363 from ilya-lavrenov:ocl_enable_tests

11 years agoMerge pull request #1370 from ilya-lavrenov:ocl_decor
Roman Donchenko [Fri, 30 Aug 2013 08:21:26 +0000 (12:21 +0400)]
Merge pull request #1370 from ilya-lavrenov:ocl_decor

11 years agoPython bindings for KeyPoint methods
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])

11 years agoAdd IPP support in meanStdDev, minMaxIdx, norm functions
kdrobnyh [Thu, 29 Aug 2013 17:05:35 +0000 (21:05 +0400)]
Add IPP support in meanStdDev, minMaxIdx, norm functions

11 years agoMerge pull request #5 from Itseez/2.4
kdrobnyh [Thu, 29 Aug 2013 14:53:46 +0000 (07:53 -0700)]
Merge pull request #5 from Itseez/2.4

Some changes in OpenCV

11 years agoenabled some tests that failed before OCL_TEST_CYCLE*() macroses were defined and...
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

11 years agogpu -> ocl
ilya-lavrenov [Thu, 29 Aug 2013 11:55:53 +0000 (15:55 +0400)]
gpu -> ocl

11 years agoMerge pull request #1361 from asmorkalov:winrt_api_container
Roman Donchenko [Thu, 29 Aug 2013 14:09:06 +0000 (18:09 +0400)]
Merge pull request #1361 from asmorkalov:winrt_api_container

11 years agoMerge pull request #1359 from asmorkalov:winrt_tiff_api_fix
Roman Donchenko [Thu, 29 Aug 2013 14:07:57 +0000 (18:07 +0400)]
Merge pull request #1359 from asmorkalov:winrt_tiff_api_fix

11 years agoAdd IPP support in compare function
kdrobnyh [Mon, 19 Aug 2013 12:41:31 +0000 (16:41 +0400)]
Add IPP support in compare function

11 years agoMerge pull request #1366 from asmorkalov:ocv_autobuffer_fix
Roman Donchenko [Thu, 29 Aug 2013 12:35:38 +0000 (16:35 +0400)]
Merge pull request #1366 from asmorkalov:ocv_autobuffer_fix

11 years agoMerge pull request #1309 from pengx17:master_retina_ocl
Roman Donchenko [Thu, 29 Aug 2013 12:26:55 +0000 (16:26 +0400)]
Merge pull request #1309 from pengx17:master_retina_ocl