Roman Donchenko
0033d453f2
Merge pull request #1426 from nailbiter:optimPD
2013-09-13 13:27:02 +04:00
Roman Donchenko
e3b92a9591
Merge pull request #1441 from look4pritam:prism-stereo
2013-09-13 13:17:06 +04:00
Roman Donchenko
4082a0c64e
Merge pull request #1442 from SpecLad:version-status
2013-09-13 13:16:30 +04:00
hbristow
232f11e256
Updated OpenCVFindMatlab with changes suggested by SpecLad
2013-09-13 18:08:33 +10:00
hbristow
530ad447bc
Added fixes to CMakeLists.txt
2013-09-13 17:22:12 +10:00
Ovidiu Parvu
8bada4c751
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.
2013-09-12 23:47:48 +01:00
Ozan Tonkal
3f27ba54e0
re-render the scene after changing camera properties
2013-09-12 19:23:05 +02:00
Ovidiu Parvu
0ed2f6201d
Optimised one assert statement in the min_enclosing_triangle.cpp file. Added the minEnclosingTriangle functionality to the existing minarea.cpp sample file.
2013-09-12 15:01:21 +01:00
Ovidiu Parvu
9902affae6
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.
2013-09-12 14:34:08 +01:00
Roman Donchenko
d669559ec3
Bumped version to 3.0.
2013-09-12 16:40:14 +04:00
Roman Donchenko
b525c28244
Updated the Java bindings and docs to support the version status.
2013-09-12 16:39:14 +04:00
Roman Donchenko
473bfb0019
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).
2013-09-12 16:37:30 +04:00
Roman Donchenko
cd8ff69637
Added version status support into the build system.
2013-09-12 16:37:05 +04:00
Ovidiu Parvu
4fce8e6b0e
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
2013-09-12 13:29:10 +01:00
Roman Donchenko
887825e831
Added an additional version component - the development status.
...
This will allow us to distinguish between regular releases, prereleases
and development versions.
2013-09-12 16:20:09 +04:00
antonella
5b2d557502
Added plantuml extension
...
Aligned strings in CMakeList
Modified the check on plantuml extension
Some fixes
Moved find_host_program for plantuml script
2013-09-12 10:41:21 +00:00
look4pritam
7fd7bbc9f1
The prism distortion coefficients are added for the stereo calibration.
2013-09-12 15:17:11 +05:30
Ovidiu Parvu
510ad8e779
- 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
2013-09-12 10:11:38 +01:00
Ovidiu Parvu
e6b58c4e79
- Added the minEnclosingTriangle function declaration to the imgproc header
...
- Added the source code for the function in the separate file min_enclosing_triangle.cpp
2013-09-11 18:07:19 +01:00
Roman Donchenko
4fe8e377ed
Merge pull request #1436 from SpecLad:host-git
2013-09-11 19:06:50 +04:00
Roman Donchenko
03926fac20
Fixed finding Git when cross-compiling.
2013-09-11 17:54:34 +04:00
Ozan Tonkal
620d92824c
hide VizMap and VizPair from public interface
2013-09-11 13:23:57 +02:00
Vladislav Vinogradov
6bbac2a7d9
Merge branch 'master' into gpu-cuda-rename
2013-09-11 09:41:23 +04:00
Roman Donchenko
acc2ca484c
Merge pull request #1425 from pengx17:master_retina_ocl_fix
2013-09-10 18:29:25 +04:00
Roman Donchenko
242e4254f3
Merge pull request #1427 from SpecLad:merge-2.4
2013-09-10 18:28:20 +04:00
Roman Donchenko
7238479813
Merge pull request #1415 from znah:sfm_py
2013-09-10 11:37:05 +04:00
Roman Donchenko
54c6830937
Merge pull request #1422 from SpecLad:nat-act-upd
2013-09-10 11:32:09 +04:00
Roman Donchenko
95c2e8b51f
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
2013-09-10 11:30:19 +04:00
peng xiao
8767c47463
Fix whitespaces.
2013-09-10 15:13:53 +08:00
pengxiao
a92721b569
Fix retina ocl on NV.
...
Previously we incorrectly assumed data was aligned in 16 bytes, which should be 32.
2013-09-10 14:33:23 +08:00
Alex Leontiev
a29863ee7b
Eliminate use of 32-bit floating pt type
...
Replace all "float" by "double" (64-bit) to avoid "lose precision"
warnings.
2013-09-10 13:53:26 +08:00
Alex Leontiev
1207cd132b
Minor fixes
...
Fixed integer vs unsigned integer comparison in .cpp test source and
trailing whitespaces in source code
2013-09-10 13:53:26 +08:00
Alex Leontiev
11fa0651c6
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
2013-09-10 13:53:26 +08:00
Alex Leontiev
ccc71ac190
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.
2013-09-10 13:53:26 +08:00
lluis
ad94628038
Using cv::magnitude instead of custom loop and Mat<float> instead of Mat<double> to compute gradient magnitude channel.
2013-09-09 18:37:55 +02:00
Roman Donchenko
4ee5599d4b
Merge pull request #1381 from 23pointsNorth:master
2013-09-09 19:53:56 +04:00
Roman Donchenko
3609bb41a7
Updated the native activity sample to master's API.
2013-09-09 18:17:02 +04:00
Roman Donchenko
59dd5aea00
Reenabled adding native app glue for Android samples.
2013-09-09 18:16:20 +04:00
Roman Donchenko
d5aaab745f
Merge pull request #1282 from nailbiter:optimDS
2013-09-09 18:10:13 +04:00
Nghia Ho
0e06465a23
Merge remote-tracking branch 'upstream/master'
2013-09-09 23:23:12 +10:00
Roman Donchenko
531471b0aa
Merge pull request #1412 from jet47:gpu-match-template-nocuda
2013-09-09 16:49:33 +04:00
Roman Donchenko
84435ba741
Merge pull request #1365 from bitwangyaoyao:2.4_bilateral
2013-09-09 16:46:33 +04:00
Roman Donchenko
574f011a33
Merge pull request #1410 from SpecLad:module-samples
2013-09-09 15:03:41 +04:00
Roman Donchenko
2208248dda
Merge pull request #1416 from asmorkalov:doc_hough_circle
2013-09-09 15:03:08 +04:00
Alexander Mordvintsev
79d51c3398
expose findEssentialMat, decomposeEssentialMat and recoverPose to Python
2013-09-09 14:02:05 +04:00
Alexander Smorkalov
40212e1eb9
Link to Hough Circle Transform sample fixed in tutorial.
2013-09-09 13:53:49 +04:00
lluis
e8d3732aaf
added computeNMChannels helper function to compute the diferent channels to be processed independently in the N&M algorithm.
2013-09-09 11:37:58 +02:00
Vladislav Vinogradov
1036ce807c
Merge branch 'master' into gpu-cuda-rename
...
Conflicts:
modules/core/include/opencv2/core/cuda.hpp
modules/cudaimgproc/src/gftt.cpp
modules/objdetect/include/opencv2/objdetect/erfilter.hpp
modules/objdetect/src/erfilter.cpp
modules/superres/perf/perf_superres.cpp
modules/superres/src/btv_l1_cuda.cpp
modules/superres/src/optical_flow.cpp
modules/videostab/src/global_motion.cpp
modules/videostab/src/inpainting.cpp
samples/cpp/stitching_detailed.cpp
samples/cpp/videostab.cpp
samples/gpu/stereo_multi.cpp
2013-09-09 12:57:35 +04:00
Roman Donchenko
cb0fc230f1
Merge pull request #1387 from vpisarev:ipp_imgwarp
2013-09-09 12:54:32 +04:00
Roman Donchenko
45512a93e0
Merge pull request #1396 from melody-rain:2.4_perf_bgfg_cpp
2013-09-09 12:39:12 +04:00