hbristow [Wed, 18 Sep 2013 07:10:54 +0000 (17:10 +1000)]
Fixed a memory leak in mxarray
Alexander Smorkalov [Wed, 18 Sep 2013 06:39:52 +0000 (10:39 +0400)]
Merge pull request #1465 from jet47:cudev-old-cc
Alexander Alekhin [Tue, 17 Sep 2013 21:14:41 +0000 (01:14 +0400)]
ocl: fix invalid usage of alignSize (n is not a power of 2), added roundUp
Alexander Smorkalov [Tue, 17 Sep 2013 18:50:48 +0000 (22:50 +0400)]
Merge pull request #1458 from look4pritam:my-branch
Ozan Tonkal [Tue, 17 Sep 2013 18:17:13 +0000 (20:17 +0200)]
include viz tutorials in the main tutorials file. ignore viz samples
Ozan Tonkal [Tue, 17 Sep 2013 16:55:10 +0000 (18:55 +0200)]
ignore viz tutorials when BUILD_opencv_viz is not set
Ozan Tonkal [Tue, 17 Sep 2013 15:50:14 +0000 (17:50 +0200)]
Merge remote-tracking branch 'itseezstream/master'
Andrey Pavlenko [Tue, 17 Sep 2013 13:50:46 +0000 (17:50 +0400)]
Merge pull request #1446 from lluisgomez:scene_text_detection_NM_fix2
Vladislav Vinogradov [Tue, 17 Sep 2013 13:43:12 +0000 (17:43 +0400)]
fixed cudev compilation for old pre-Fermi archs
Alexander Smorkalov [Tue, 17 Sep 2013 11:37:44 +0000 (15:37 +0400)]
Merge pull request #1460 from ilya-lavrenov:ocl_divUp
Alexander Smorkalov [Tue, 17 Sep 2013 11:21:34 +0000 (15:21 +0400)]
Merge pull request #1461 from ilya-lavrenov:ocl_dataOperations
Alexander Smorkalov [Tue, 17 Sep 2013 11:12:01 +0000 (15:12 +0400)]
Merge pull request #1439 from ilya-lavrenov:convertTo
Alexander Smorkalov [Tue, 17 Sep 2013 10:36:30 +0000 (14:36 +0400)]
Merge pull request #1449 from SpecLad:dc1394-095
Alexander Smorkalov [Tue, 17 Sep 2013 10:35:40 +0000 (14:35 +0400)]
Merge pull request #1452 from alalek:fix_cv_export_templates
Andrey Pavlenko [Tue, 17 Sep 2013 10:03:40 +0000 (14:03 +0400)]
Merge pull request #1454 from ilya-lavrenov:ocl_pyrUp
Alexander Smorkalov [Tue, 17 Sep 2013 09:18:51 +0000 (13:18 +0400)]
Merge pull request #1455 from ilya-lavrenov:ocl_test_output
Ilya Lavrenov [Mon, 16 Sep 2013 14:55:37 +0000 (18:55 +0400)]
added performance tests for data transfer operations
Ilya Lavrenov [Mon, 16 Sep 2013 11:11:56 +0000 (15:11 +0400)]
removed needless divUp
look4pritam [Mon, 16 Sep 2013 08:09:11 +0000 (13:39 +0530)]
The thin prism distortion coefficient related small bug is fixed.
Ovidiu Parvu [Sun, 15 Sep 2013 22:40:40 +0000 (23:40 +0100)]
Added the C interface function signature and the overloaded minEnclosingTriangle Python function to the documentation.
Ovidiu Parvu [Sun, 15 Sep 2013 22:25:36 +0000 (23:25 +0100)]
Changed the return type of cvMinEnclosingTriangle to CVAPI(void). Added the implementation of the function to the min_enclosing_triangle.cpp source file.
Ovidiu Parvu [Sun, 15 Sep 2013 21:40:57 +0000 (22:40 +0100)]
Added the signature cvMinEnclosingTriangle (C version) to the imgproc_c.h header
Ovidiu Parvu [Sun, 15 Sep 2013 21:25:58 +0000 (22:25 +0100)]
Added the tests for the minEnclosingTriangle function in the existing test_convhull.cpp file.
Ilya Lavrenov [Fri, 13 Sep 2013 07:27:25 +0000 (11:27 +0400)]
removed useless output
Ilya Lavrenov [Sun, 15 Sep 2013 15:56:05 +0000 (19:56 +0400)]
fixed ocl::pyrUp for 2-byte types
Ozan Tonkal [Sun, 15 Sep 2013 14:32:56 +0000 (16:32 +0200)]
merge with Itseez/opencv
hbristow [Sun, 15 Sep 2013 14:48:07 +0000 (00:48 +1000)]
Added TODO for the future of Matlab version sorting
Ozan Tonkal [Sun, 15 Sep 2013 14:26:53 +0000 (16:26 +0200)]
rename widgets from *Widgets to W*
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)
hbristow [Sun, 15 Sep 2013 13:53:29 +0000 (23:53 +1000)]
Streamlined mexext detection, with removal of trailing whitespace/newlines handled by execute_process
Alexander Alekhin [Sun, 15 Sep 2013 03:05:30 +0000 (07:05 +0400)]
remove CV_EXPORT from templates
Ozan Tonkal [Sun, 15 Sep 2013 09:24:20 +0000 (11:24 +0200)]
cmake check if VTK version is lower than 5, and give fatal error if it is
hbristow [Sun, 15 Sep 2013 07:31:34 +0000 (17:31 +1000)]
Moved Jinja2 into 3rdparty. Now using latest stable version from pypi (2.7.1)
hbristow [Sat, 14 Sep 2013 03:32:15 +0000 (13:32 +1000)]
Made changes to OpenCVFindMatlab suggested by SpecLad
Andrey Pavlenko [Fri, 13 Sep 2013 15:53:20 +0000 (19:53 +0400)]
Merge pull request #1444 from ilya-lavrenov:ocl_test_mog
lluis [Fri, 13 Sep 2013 14:29:21 +0000 (16:29 +0200)]
first parameter of createERFilterNM1/createERFilterNM2 is now mandatory. changed the sample program to use the new prototypes
lluis [Fri, 13 Sep 2013 14:19:52 +0000 (16:19 +0200)]
renamed getDefaultClassifierNM{1,2}() to loadClassifierNM{1,2}() and added "const std::string& filename" parameter (mandatory).
Roman Donchenko [Fri, 13 Sep 2013 13:25:21 +0000 (17:25 +0400)]
Dropped the HAVE_DC1394_095 configuration macro.
We never set it, and libdc1394 0.9.5 is obsolete anyway - 1.0 came out
in 2004.
Note that 1.0 doesn't have the do_extra_buffering parameter.
StevenPuttemans [Fri, 13 Sep 2013 13:01:18 +0000 (15:01 +0200)]
Added typo in docs of tutorial
Roman Donchenko [Fri, 13 Sep 2013 11:01:14 +0000 (15:01 +0400)]
Merge pull request #1445 from vpisarev:stereocalib_quick_fix
lluis [Fri, 13 Sep 2013 10:54:23 +0000 (12:54 +0200)]
functions getDefaultClassifierNM1() and getDefaultClassifierNM2() allow to implicitly load the default classifiers when creating a ERFilter object
Roman Donchenko [Fri, 13 Sep 2013 10:31:01 +0000 (14:31 +0400)]
Merge pull request #1330 from lenlen:plantuml
Vadim Pisarevsky [Fri, 13 Sep 2013 09:32:42 +0000 (13:32 +0400)]
fix thin-prism coefficients at 0's in the stereo calibration function unless the flag CALIB_THIN_PRISM_MODEL is explicitly set
Roman Donchenko [Fri, 13 Sep 2013 09:31:14 +0000 (13:31 +0400)]
Merge pull request #1414 from lluisgomez:scene_text_detection_computeNMChannels
Roman Donchenko [Fri, 13 Sep 2013 09:27:01 +0000 (13:27 +0400)]
Merge pull request #1426 from nailbiter:optimPD
Roman Donchenko [Fri, 13 Sep 2013 09:17:05 +0000 (13:17 +0400)]
Merge pull request #1441 from look4pritam:prism-stereo
Roman Donchenko [Fri, 13 Sep 2013 09:16:30 +0000 (13:16 +0400)]
Merge pull request #1442 from SpecLad:version-status
Ilya Lavrenov [Fri, 13 Sep 2013 08:47:25 +0000 (12:47 +0400)]
disabled MOG tests if no video input support
hbristow [Fri, 13 Sep 2013 08:08:33 +0000 (18:08 +1000)]
Updated OpenCVFindMatlab with changes suggested by SpecLad
hbristow [Fri, 13 Sep 2013 07:22:12 +0000 (17:22 +1000)]
Added fixes to CMakeLists.txt
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.
Ozan Tonkal [Thu, 12 Sep 2013 17:23:05 +0000 (19:23 +0200)]
re-render the scene after changing camera properties
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.
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.
Roman Donchenko [Thu, 12 Sep 2013 12:54:21 +0000 (16:54 +0400)]
Merge pull request #1434 from melody-rain:Added_perf_kalman_cpp
Roman Donchenko [Thu, 12 Sep 2013 12:40:14 +0000 (16:40 +0400)]
Bumped version to 3.0.
Roman Donchenko [Thu, 12 Sep 2013 12:39:14 +0000 (16:39 +0400)]
Updated the Java bindings and docs to support the version status.
Roman Donchenko [Thu, 12 Sep 2013 12:37:30 +0000 (16:37 +0400)]
Updated the build config files to deal with the version status.
I didn't make the status part of the version variables here, because
letters don't play too well with version comparison algorithms
(especially with CMake's, which only supports numbers).
Roman Donchenko [Thu, 12 Sep 2013 12:37:05 +0000 (16:37 +0400)]
Added version status support into the build system.
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
Roman Donchenko [Thu, 12 Sep 2013 12:20:09 +0000 (16:20 +0400)]
Added an additional version component - the development status.
This will allow us to distinguish between regular releases, prereleases
and development versions.
antonella [Wed, 4 Sep 2013 14:00:50 +0000 (16:00 +0200)]
Added plantuml extension
Aligned strings in CMakeList
Modified the check on plantuml extension
Some fixes
Moved find_host_program for plantuml script
Roman Donchenko [Thu, 12 Sep 2013 09:56:23 +0000 (13:56 +0400)]
Merge pull request #1440 from SpecLad:wcast-align
look4pritam [Thu, 12 Sep 2013 09:47:11 +0000 (15:17 +0530)]
The prism distortion coefficients are added for the stereo calibration.
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
Roman Donchenko [Thu, 12 Sep 2013 08:58:10 +0000 (12:58 +0400)]
Revert "Merge pull request #1376 from StevenPuttemans:bugfix_3186"
This reverts commit
41b8479d039bb0ecc36627ae50349b6fcd5e16e3, reversing
changes made to
531471b0aa4b4e8f9fcab8282d5cbe895b77e6e0.
Reason: breaks the build.
Roman Donchenko [Thu, 12 Sep 2013 08:48:44 +0000 (12:48 +0400)]
Merge pull request #1428 from ilya-lavrenov:ocl_pyr
Ilya Lavrenov [Wed, 11 Sep 2013 09:35:39 +0000 (13:35 +0400)]
extended ocl::convertTo
Roman Donchenko [Thu, 12 Sep 2013 08:31:13 +0000 (12:31 +0400)]
Silenced a few -Wcast-align warnings in the headers.
We don't use -Wcast-align ourselves, but the headers trigger warnings
for those users who do, which is not nice.
Roman Donchenko [Thu, 12 Sep 2013 08:19:36 +0000 (12:19 +0400)]
Merge pull request #1418 from vpisarev:24_ipp_sepfilter_dft
Roman Donchenko [Thu, 12 Sep 2013 08:18:54 +0000 (12:18 +0400)]
Merge pull request #1386 from asmorkalov:android_abic_check_opt_java
Alexander Smorkalov [Mon, 2 Sep 2013 13:52:07 +0000 (17:52 +0400)]
Some improvements in ABI compatibility checker config generator.
JNI check became optional;
Pathes to SDK, NDK and Java API level can be defined by command line.
Jin Ma [Thu, 12 Sep 2013 01:43:30 +0000 (09:43 +0800)]
Revised the code according to the feedback of the community.
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
Roman Donchenko [Wed, 11 Sep 2013 15:06:50 +0000 (19:06 +0400)]
Merge pull request #1436 from SpecLad:host-git
Roman Donchenko [Wed, 11 Sep 2013 13:54:34 +0000 (17:54 +0400)]
Fixed finding Git when cross-compiling.
Ozan Tonkal [Wed, 11 Sep 2013 11:23:57 +0000 (13:23 +0200)]
hide VizMap and VizPair from public interface
Roman Donchenko [Wed, 11 Sep 2013 09:50:35 +0000 (13:50 +0400)]
Merge pull request #1432 from SpecLad:unseq
Roman Donchenko [Wed, 11 Sep 2013 09:50:02 +0000 (13:50 +0400)]
Merge pull request #1431 from asmorkalov:android_recording_hint
Vladislav Vinogradov [Wed, 11 Sep 2013 05:41:23 +0000 (09:41 +0400)]
Merge branch 'master' into gpu-cuda-rename
Jin Ma [Wed, 11 Sep 2013 03:28:36 +0000 (11:28 +0800)]
Removed whitespace.
Jin Ma [Wed, 11 Sep 2013 02:19:02 +0000 (10:19 +0800)]
Added performance for Kalman Filter.
Roman Donchenko [Tue, 10 Sep 2013 14:59:41 +0000 (18:59 +0400)]
Merge pull request #1421 from ilya-lavrenov:ocl_bilateral
Roman Donchenko [Tue, 10 Sep 2013 14:29:24 +0000 (18:29 +0400)]
Merge pull request #1425 from pengx17:master_retina_ocl_fix
Roman Donchenko [Tue, 10 Sep 2013 14:28:19 +0000 (18:28 +0400)]
Merge pull request #1427 from SpecLad:merge-2.4
Alexander Smorkalov [Tue, 10 Sep 2013 14:05:45 +0000 (18:05 +0400)]
MediaRecorder hint enabled for all Android devices with API level 14 and above.
It increases performance on some devices like Nexus4.
Target Android SDK version increased up to 14.
Roman Donchenko [Tue, 10 Sep 2013 14:05:23 +0000 (18:05 +0400)]
Eliminated unsequenced assignments to temp3 from dpstereo.cpp.
They're unsequenced if CV_IMIN3 or CV_IMAX3 are invoked more than once
in a single expression.
Ilya Lavrenov [Tue, 10 Sep 2013 07:53:34 +0000 (11:53 +0400)]
added CV_16UC(1, 3, 4), CV_16SC(1, 3, 4) data types support in ocl::pyrUp and ocl::pyrDown
Roman Donchenko [Tue, 10 Sep 2013 07:37:04 +0000 (11:37 +0400)]
Merge pull request #1415 from znah:sfm_py
Roman Donchenko [Tue, 10 Sep 2013 07:33:24 +0000 (11:33 +0400)]
Merge pull request #1417 from ilya-lavrenov:merge_fix
Roman Donchenko [Tue, 10 Sep 2013 07:32:34 +0000 (11:32 +0400)]
Merge pull request #1420 from ilya-lavrenov:ocl_perf_hog
Roman Donchenko [Tue, 10 Sep 2013 07:32:09 +0000 (11:32 +0400)]
Merge pull request #1422 from SpecLad:nat-act-upd
Roman Donchenko [Tue, 10 Sep 2013 07:30:19 +0000 (11:30 +0400)]
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
.gitignore
doc/tutorials/objdetect/cascade_classifier/cascade_classifier.rst
modules/gpu/src/match_template.cpp
modules/imgproc/include/opencv2/imgproc/imgproc.hpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_precomp.hpp
Roman Donchenko [Tue, 10 Sep 2013 07:28:21 +0000 (11:28 +0400)]
Merge pull request #1413 from melody-rain:2.4_kalman_filter
peng xiao [Tue, 10 Sep 2013 07:13:53 +0000 (15:13 +0800)]
Fix whitespaces.
pengxiao [Tue, 10 Sep 2013 06:33:23 +0000 (14:33 +0800)]
Fix retina ocl on NV.
Previously we incorrectly assumed data was aligned in 16 bytes, which should be 32.
Alex Leontiev [Sun, 1 Sep 2013 05:59:15 +0000 (13:59 +0800)]
Eliminate use of 32-bit floating pt type
Replace all "float" by "double" (64-bit) to avoid "lose precision"
warnings.
Alex Leontiev [Sat, 31 Aug 2013 23:11:31 +0000 (07:11 +0800)]
Minor fixes
Fixed integer vs unsigned integer comparison in .cpp test source and
trailing whitespaces in source code
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.