a117400577
ignore viz tutorials when BUILD_opencv_viz is not set
2013-09-17 18:55:10 +02:00
e3e5fd5baa
Merge remote-tracking branch 'itseezstream/master'
2013-09-17 17:50:14 +02:00
ad404ef44f
Merge pull request #1446 from lluisgomez:scene_text_detection_NM_fix2
2013-09-17 17:50:46 +04:00
3165b526f2
merge with Itseez/opencv
2013-09-15 17:51:27 +02:00
c31fb8ffff
rename widgets from *Widgets to W*
2013-09-15 16:26:53 +02:00
f570b3e18d
cmake check if VTK version is lower than 5, and give fatal error if it is
2013-09-15 11:24:20 +02:00
d25309f82e
first parameter of createERFilterNM1/createERFilterNM2 is now mandatory. changed the sample program to use the new prototypes
2013-09-13 16:29:21 +02:00
75fdfba281
renamed getDefaultClassifierNM{1,2}() to loadClassifierNM{1,2}() and added "const std::string& filename" parameter (mandatory).
2013-09-13 16:19:52 +02:00
eff21788a8
Merge pull request #1445 from vpisarev:stereocalib_quick_fix
2013-09-13 15:01:14 +04:00
95d92c099c
functions getDefaultClassifierNM1() and getDefaultClassifierNM2() allow to implicitly load the default classifiers when creating a ERFilter object
2013-09-13 12:54:23 +02:00
160ab8415e
Merge pull request #1330 from lenlen:plantuml
2013-09-13 14:31:01 +04:00
84022b0c19
fix thin-prism coefficients at 0's in the stereo calibration function unless the flag CALIB_THIN_PRISM_MODEL is explicitly set
2013-09-13 13:32:42 +04:00
c511d5d649
Merge pull request #1414 from lluisgomez:scene_text_detection_computeNMChannels
2013-09-13 13:31:14 +04:00
0033d453f2
Merge pull request #1426 from nailbiter:optimPD
2013-09-13 13:27:02 +04:00
e3b92a9591
Merge pull request #1441 from look4pritam:prism-stereo
2013-09-13 13:17:06 +04:00
4082a0c64e
Merge pull request #1442 from SpecLad:version-status
2013-09-13 13:16:30 +04:00
3f27ba54e0
re-render the scene after changing camera properties
2013-09-12 19:23:05 +02:00
d669559ec3
Bumped version to 3.0.
2013-09-12 16:40:14 +04:00
b525c28244
Updated the Java bindings and docs to support the version status.
2013-09-12 16:39:14 +04:00
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
cd8ff69637
Added version status support into the build system.
2013-09-12 16:37:05 +04:00
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
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
7fd7bbc9f1
The prism distortion coefficients are added for the stereo calibration.
2013-09-12 15:17:11 +05:30
4fe8e377ed
Merge pull request #1436 from SpecLad:host-git
2013-09-11 19:06:50 +04:00
03926fac20
Fixed finding Git when cross-compiling.
2013-09-11 17:54:34 +04:00
620d92824c
hide VizMap and VizPair from public interface
2013-09-11 13:23:57 +02:00
acc2ca484c
Merge pull request #1425 from pengx17:master_retina_ocl_fix
2013-09-10 18:29:25 +04:00
242e4254f3
Merge pull request #1427 from SpecLad:merge-2.4
2013-09-10 18:28:20 +04:00
7238479813
Merge pull request #1415 from znah:sfm_py
2013-09-10 11:37:05 +04:00
54c6830937
Merge pull request #1422 from SpecLad:nat-act-upd
2013-09-10 11:32:09 +04:00
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
8767c47463
Fix whitespaces.
2013-09-10 15:13:53 +08:00
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
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
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
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
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
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
4ee5599d4b
Merge pull request #1381 from 23pointsNorth:master
2013-09-09 19:53:56 +04:00
3609bb41a7
Updated the native activity sample to master's API.
2013-09-09 18:17:02 +04:00
59dd5aea00
Reenabled adding native app glue for Android samples.
2013-09-09 18:16:20 +04:00
d5aaab745f
Merge pull request #1282 from nailbiter:optimDS
2013-09-09 18:10:13 +04:00
531471b0aa
Merge pull request #1412 from jet47:gpu-match-template-nocuda
2013-09-09 16:49:33 +04:00
84435ba741
Merge pull request #1365 from bitwangyaoyao:2.4_bilateral
2013-09-09 16:46:33 +04:00
574f011a33
Merge pull request #1410 from SpecLad:module-samples
2013-09-09 15:03:41 +04:00
2208248dda
Merge pull request #1416 from asmorkalov:doc_hough_circle
2013-09-09 15:03:08 +04:00
79d51c3398
expose findEssentialMat, decomposeEssentialMat and recoverPose to Python
2013-09-09 14:02:05 +04:00
40212e1eb9
Link to Hough Circle Transform sample fixed in tutorial.
2013-09-09 13:53:49 +04:00
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
Ozan Tonkal