abidrahmank
899781b3d6
GSoC Python Tutorials
...
GSoC Python Tutorials
removed white spaces
removed blank lines at EOF
removed duplicate labels
2013-09-23 13:41:14 +05:30
Alexander Smorkalov
c0c575d68e
Merge pull request #1481 from Human:master
2013-09-20 11:08:09 +04:00
Alexander Smorkalov
1445a29e1c
Merge pull request #1469 from lluisgomez:scene_text_detection_erGrouping
2013-09-20 10:54:53 +04:00
Bob Igo
2eb5ca0024
fixed malformed XML
2013-09-19 16:32:32 -04:00
Alexander Smorkalov
0ecd7913f8
Merge pull request #1472 from alalek:master_fix_debug_builds_on_win
2013-09-19 14:41:55 +04:00
lluis
2837bfd9fa
Added erGrouping function: Find groups of Extremal Regions that are organized as text blocks. Updated sample/cpp to use the complete text detection pipeline
2013-09-19 10:30:25 +02:00
Alexander Smorkalov
c550e452f9
Merge pull request #1384 from hbristow:matlab_public
2013-09-19 10:25:02 +04:00
Alexander Alekhin
81ac97c6bd
fix for broken debug builds (MSVS2010/2012)
2013-09-18 16:05:21 +04:00
hbristow
d84ab09ab7
Updated documentation
2013-09-18 18:52:23 +10:00
hbristow
1dd017e9d0
Fixed a memory leak in mxarray
2013-09-18 17:10:54 +10:00
Alexander Smorkalov
99a43257d5
Merge pull request #1465 from jet47:cudev-old-cc
2013-09-18 10:39:53 +04:00
Alexander Smorkalov
3fa3722641
Merge pull request #1458 from look4pritam:my-branch
2013-09-17 22:50:48 +04:00
Andrey Pavlenko
ad404ef44f
Merge pull request #1446 from lluisgomez:scene_text_detection_NM_fix2
2013-09-17 17:50:46 +04:00
Vladislav Vinogradov
20f636fcee
fixed cudev compilation for old pre-Fermi archs
2013-09-17 17:43:12 +04:00
look4pritam
a430abd02e
The thin prism distortion coefficient related small bug is fixed.
2013-09-16 13:39:11 +05:30
hbristow
eb3a83209c
Added TODO for the future of Matlab version sorting
2013-09-16 00:48:07 +10:00
hbristow
31c58d23e0
Streamlined mexext detection, with removal of trailing whitespace/newlines handled by execute_process
2013-09-15 23:53:29 +10:00
hbristow
86b7e3d15d
Moved Jinja2 into 3rdparty. Now using latest stable version from pypi (2.7.1)
2013-09-15 17:36:13 +10:00
hbristow
224f44a255
Made changes to OpenCVFindMatlab suggested by SpecLad
2013-09-14 13:32:15 +10:00
lluis
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
lluis
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
Roman Donchenko
eff21788a8
Merge pull request #1445 from vpisarev:stereocalib_quick_fix
2013-09-13 15:01:14 +04:00
lluis
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
Roman Donchenko
160ab8415e
Merge pull request #1330 from lenlen:plantuml
2013-09-13 14:31:01 +04:00
Vadim Pisarevsky
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
Roman Donchenko
c511d5d649
Merge pull request #1414 from lluisgomez:scene_text_detection_computeNMChannels
2013-09-13 13:31:14 +04:00
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
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
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
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
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