Roman Donchenko
e9a28f66ee
Normalized file endings.
2013-08-21 18:59:25 +04:00
Roman Donchenko
f55740da70
Deleted all trailing whitespace.
2013-08-21 18:59:24 +04:00
Roman Donchenko
bae85660da
Merge remote-tracking branch 'origin/2.4'
...
Pull requests:
#943 from jet47:cuda-5.5-support
#944 from jet47:cmake-2.8.11-cuda-fix
#912 from SpecLad:contributing
#934 from SpecLad:parallel-for
#931 from jet47:gpu-test-fixes
#932 from bitwangyaoyao:2.4_fixBFM
#918 from bitwangyaoyao:2.4_samples
#924 from pengx17:2.4_arithm_fix
#925 from pengx17:2.4_canny_tmp_fix
#927 from bitwangyaoyao:2.4_perf
#930 from pengx17:2.4_haar_ext
#928 from apavlenko:bugfix_3027
#920 from asmorkalov:android_move
#910 from pengx17:2.4_oclgfft
#913 from janm399:2.4
#916 from bitwangyaoyao:2.4_fixPyrLK
#919 from abidrahmank:2.4
#923 from pengx17:2.4_macfix
Conflicts:
modules/calib3d/src/stereobm.cpp
modules/features2d/src/detectors.cpp
modules/gpu/src/error.cpp
modules/gpu/src/precomp.hpp
modules/imgproc/src/distransform.cpp
modules/imgproc/src/morph.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_color.cpp
modules/ocl/perf/perf_imgproc.cpp
modules/ocl/perf/perf_match_template.cpp
modules/ocl/perf/precomp.cpp
modules/ocl/perf/precomp.hpp
modules/ocl/src/arithm.cpp
modules/ocl/src/canny.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/hog.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/opencl/haarobjectdetect.cl
modules/ocl/src/pyrlk.cpp
modules/video/src/bgfg_gaussmix2.cpp
modules/video/src/lkpyramid.cpp
platforms/linux/scripts/cmake_arm_gnueabi_hardfp.sh
platforms/linux/scripts/cmake_arm_gnueabi_softfp.sh
platforms/scripts/ABI_compat_generator.py
samples/ocl/facedetect.cpp
2013-06-05 15:42:07 +04:00
abidrahmank
2dd3bf116e
ANDed waitkey result with 0xFF for x64 systems
2013-05-27 10:30:30 +05:30
abidrahmank
98960bf201
A new python sample on grabcut
2013-05-25 00:55:31 +05:30
Pastafarianist
d2116f38fe
Fixed typo
2013-05-05 16:17:41 +04:00
Andrey Kamaev
f886651cf0
Drop old python samples and tests
2013-04-12 19:37:40 +04:00
Andrey Kamaev
3b364330ad
Merge branch '2.4'
2013-04-12 15:35:38 +04:00
Roman Donchenko
57d4c86b2b
Fixed the shebang lines on the Python scripts.
...
Also, removed the one from modules/python/src2/cv.py and cleared its
executable bit, since it's not a script.
2013-04-11 18:37:23 +04:00
Andrey Kamaev
6ef43cd96e
Merge pull request #779 from sivapvarma:master
2013-04-08 10:11:33 +04:00
Andrey Kamaev
67073daf19
Merge branch '2.4'
2013-04-05 21:11:59 +04:00
Siva Prasad Varma
3b0ce8e132
Add HoughTransform examples python2
...
houghlines.py for HoughLinesP() and HoughLines()
houghcircles.py for HoughCircles()
2013-04-05 14:32:07 +05:30
Dustin Spicuzza
b08432cfe7
Port dft.py sample from cv to cv2
2013-03-29 17:37:00 -04:00
Andrey Kamaev
e75df56317
Unified handling of InputOutputArrays in Python wrapper generator
...
This makes arguments of type InputOutputArray required in python unless they
have a default value in C++.
As result following python functions changes signatures in non-trivial way:
* calcOpticalFlowFarneback
* calcOpticalFlowPyrLK
* calibrateCamera
* findContours
* findTransformECC
* floodFill
* kmeans
* PCACompute
* stereoCalibrate
And the following functions become return their modified inputs as a return
value:
* accumulate
* accumulateProduct
* accumulateSquare
* accumulateWeighted
* circle
* completeSymm
* cornerSubPix
* drawChessboardCorners
* drawContours
* drawDataMatrixCodes
* ellipse
* fillConvexPoly
* fillPoly
* filterSpeckles
* grabCut
* insertChannel
* line
* patchNaNs
* polylines
* randn
* randShuffle
* randu
* rectangle
* setIdentity
* updateMotionHistory
* validateDisparity
* watershed
2013-03-15 17:44:49 +04:00
Moshe Kaplan
bd042d9cc3
Fixed shebangs, added error checking
2013-03-06 01:41:02 -05:00
Moshe Kaplan
facd580f28
Small changes to Python samples
...
Update find_obj.py:
Added additional error checking for the loaded files and modified the detector check to be more pythonic (is versus ==).
Update common.py:
Fixed a typo (contais -> contains)
2013-03-04 12:25:35 -05:00
Abid K
96b2898f38
Update samples/python2/hist.py
...
range in calcHist() changed from [0,255] to [0,256]. Otherwise, it won't count pixels with value 255. It can be verified taking sum of histogram values and checking it with image size.
2013-02-19 19:31:53 +05:30
marina.kolpakova
285d6320be
add #/usr/bin/env python to all python files
2012-11-23 22:57:22 +04:00
OpenCV Buildbot
04384a71e4
Normalize line endings and whitespace
2012-10-17 15:32:23 +04:00
Alexander Mordvintsev
2a96f28bc1
get rid of Lock in gabor_threads.py
2012-09-17 19:30:20 +04:00
Alexander Mordvintesv
d9185ec21b
added _doc.py -- doc-string ckecking utility
...
added some sample description
2012-08-22 16:42:19 +03:00
Alexander Mordvintesv
c9f2ff4487
added texture_flow.py sample
2012-08-19 20:36:50 +03:00
Alexander Mordvintesv
a4bffd96c4
added deconvolution.py sample and example images
2012-08-18 19:43:32 +03:00
Philipp Wagner
9c75ff43ba
Bug #2257 : Adding a quick workaround for truncated labels on 64bit machines in the Python FaceRecognizer wrapper code. This is only a temporary bugfix, that will be fixed at a better point as soon as possible.
2012-08-11 22:36:35 +02:00
Philipp Wagner
6161a3335c
Removed writing the test.png, wasn't meant to be commited.
2012-08-09 23:52:09 +02:00
Alexander Mordvintesv
7db1f711f6
Merge branch 'master' of code.opencv.org:opencv
...
Conflicts:
samples/python2/common.py
samples/python2/feature_homography.py
samples/python2/plane_ar.py
samples/python2/plane_tracker.py
2012-08-07 23:21:56 +03:00
Alexander Mordvintesv
a29be81d77
typo fix in features_homography.py
2012-08-07 21:37:46 +03:00
Andrey Kamaev
5100ca7508
svn repository web references are replaced with links to git
2012-08-07 14:30:36 +04:00
Vadim Pisarevsky
2013118971
new/improved Python samples by Alexander Mordvintsev
2012-08-06 16:35:35 +04:00
Alexander Mordvintesv
d9dc02541a
Added descriptions to PlaneTracker samples
2012-08-05 10:20:42 +03:00
Alexander Mordvintesv
353c69e017
created PlaneTracker (int plane_tracker.py), which implements multitarget planar tracking
...
rewritten feature_homography.py using it
added plane_ar.py - simple augmented reality sample
2012-08-03 22:17:11 +03:00
Alexander Mordvintesv
ffa8c32348
work on feature_homography.py: multiple targets
2012-08-01 21:41:03 +03:00
Philipp Wagner
40e65b9603
facerec_demo.py: Updated contact mail address.
2012-07-30 19:31:49 +02:00
Alexander Mordvintsev
72a4f1924d
feature_homography.py:
...
building descriptor index on target capture
simple AR experiment (work in progress)
2012-07-30 12:39:41 +04:00
Philipp Wagner
c0a4105467
facerec_demo.py: Shortened code. Final version.
2012-07-30 02:24:39 +02:00
Philipp Wagner
4a7e29b3f4
facerec_demo.py: Reworked demo to remove all matplotlib dependencies.
2012-07-30 02:18:27 +02:00
Philipp Wagner
508a029dae
Moved the facerec_demo.py to the wrong directory. Now moved to the python2 folder.
2012-07-30 01:18:58 +02:00
Alexander Mordvintesv
f8facadc67
print description in mosse.py
2012-07-29 17:24:47 +03:00
Alexander Mordvintesv
f6191cc5bb
added MOSSE sample
2012-07-29 17:21:49 +03:00
Alexander Mordvintesv
0f9bbf85e5
spelling corrections, added aero images as a more impressive example for
...
ASIFT
2012-07-29 16:26:22 +03:00
Alexander Mordvintesv
88a9f8f919
spelling corrections, added aero images as a more impressive example for
...
ASIFT
2012-07-29 16:15:44 +03:00
Alexander Mordvintsev
ea96047f78
small doc fix
2012-07-16 14:17:39 +00:00
Alexander Mordvintsev
200357fdf4
window name changed
2012-07-16 14:16:36 +00:00
Alexander Mordvintsev
ad7a6ec41f
correct unknown feature report in find_obj.py
2012-07-16 12:31:56 +00:00
Alexander Mordvintsev
3ce5b01543
added asift.py sample
2012-07-16 12:29:49 +00:00
Alexander Mordvintsev
99e404fe86
moving data used by sample into a separate folder
...
small fix in find_obj.py
2012-07-16 11:46:05 +00:00
Alexander Mordvintsev
8610ff1b4d
find_obj.py allows to select detector and matcher and explore matching pairs
2012-07-16 11:31:43 +00:00
Alexander Mordvintsev
7bbc42127e
refactored find_obj.py sample:
...
- handle bad matching case
- use BFMatcher and FlannBasedMatcher (and thus fixing a bug: L2^2 metric was used for flann)
2012-07-13 20:27:54 +00:00
Alexander Mordvintsev
65e2350606
work on digits_video.py
2012-07-12 11:51:27 +00:00
Alexander Mordvintsev
84281d284e
mdot function in common.py
2012-07-11 05:07:00 +00:00
Alexander Mordvintsev
d9478252e9
show detected keypoints in feature_homography.py
2012-07-09 12:19:59 +00:00
Alexander Mordvintsev
a2c3c1800a
new feature_homography.py sample
2012-07-06 15:42:42 +00:00
Alexander Mordvintsev
1543b46383
HoG and Hellinger-metric preprocess for digit recognition
...
line breaks in fitline.py description
2012-07-02 13:49:36 +00:00
Alexander Mordvintsev
83ccdbd0ce
refactored digits_adjust.py (dataset preprocess in cloud)
2012-07-02 07:49:46 +00:00
Alexander Mordvintsev
6977a89525
descriptions for watershed.py and video.py
2012-07-02 04:44:31 +00:00
Alexander Mordvintsev
d015bf6f5e
fitline.py sample added
2012-07-02 03:51:47 +00:00
Alexander Mordvintsev
c6685bc9a7
improved recognition accuracy by better region normalization
2012-06-27 13:22:06 +00:00
Alexander Mordvintsev
60dd599aea
discard digit's internal contours in digits_video.py
2012-06-27 12:42:21 +00:00
Alexander Mordvintsev
981564ffe9
work on digits_video.py
2012-06-27 10:09:45 +00:00
Alexander Mordvintsev
c71c82a8f1
work on digits_video.py
2012-06-27 09:46:04 +00:00
Alexander Mordvintsev
b987154ebc
digits_video.py prints warning if trained classifier (should be created by digits.py) not found
2012-06-27 08:29:22 +00:00
Alexander Mordvintsev
6dffc5332d
digits_video.py (VERY IMMATURE)
...
digits.py now saves the resulting SVM classifier for use in digits_video.py
2012-06-27 05:59:16 +00:00
Alexander Mordvintsev
13b30d7428
digits_adjust.py sample added
2012-06-27 05:51:24 +00:00
Alexander Mordvintsev
d636e1128b
removed ANN digits recognition
...
added deskew for SVN and KNearest recognition sample
2012-06-27 04:29:15 +00:00
Alexander Mordvintsev
d49c697fda
added comments to contours.py and edge.py samples
2012-06-25 10:58:34 +00:00
Alexander Mordvintsev
a3220a446f
added comment to letter_recog.py sample (adopted from c++ version)
2012-06-25 10:52:45 +00:00
Alexander Mordvintsev
e0df3e27ac
added digits2.py sample (work in progress)
2012-06-18 14:42:43 +00:00
Alexander Mordvintsev
3b55e0d4e9
added kmeans.py sample
2012-06-18 11:48:04 +00:00
Alexander Mordvintsev
a98d6b6217
exposed parallelized SVM prediction to python (predict_all)
2012-06-14 10:02:49 +00:00
Alexander Mordvintsev
02e3afae3a
fixed find_obj.py (use detectAndCompute)
2012-06-12 06:31:51 +00:00
Alexander Mordvintsev
889df76ea7
added lappyr.py sample
2012-06-10 08:38:25 +00:00
Alexander Mordvintsev
455349a0eb
comments for digits.py sample
2012-06-06 05:52:28 +00:00
Alexander Mordvintsev
3cfa6949d7
work on added digits.py sample (neural network for handwritten digit recognition)
2012-06-01 13:27:56 +00:00
Alexander Mordvintsev
a61b730238
compatibility corrections
2012-05-28 09:25:08 +00:00
Alexander Mordvintsev
e0c1fb5f76
updated video_threaded.py sample:
...
- switch btw threaded and non-threaded mode
- performance counters
- description
2012-05-28 08:51:50 +00:00
Alexander Mordvintsev
6116049225
video_threaded.py sample now uses multiprocessing module's ThreadPool
2012-05-25 14:38:39 +00:00
Alexander Mordvintsev
eb28bef2db
added video_threaded.py sample
2012-05-24 15:40:55 +00:00
Alexander Mordvintsev
ddf7fde3b2
fixed gaussian_mix.py sample
2012-05-22 09:11:09 +00:00
Alexander Mordvintsev
cef18937a2
made video_dmtx.py description visible in demo.py
2012-05-22 08:45:10 +00:00
Alexander Mordvintsev
f4f41df756
removed derivLambda param for LK-tracker
...
linetype -> lineType
2012-05-22 08:43:42 +00:00
Vadim Pisarevsky
d5a0088bbe
merged 2.4 into trunk
2012-04-30 14:33:52 +00:00
Alexander Mordvintsev
5ee7596cbc
fixed EM sample
2012-04-04 12:06:36 +00:00
Vadim Pisarevsky
33bc089506
fixed HOGDescriptor::detect and HOGDescriptor::detectMultiScale signatures (ticket #1304 )
2012-03-29 17:18:38 +00:00
Gary Bradski
ad2ee1d572
import as cv not cv2. Fixed
2012-03-21 05:13:02 +00:00
Gary Bradski
c47c1adc94
remove some unneeded imports
2012-03-15 03:50:31 +00:00
Gary Bradski
dfaabd88fc
added cv2.destroyAllWindows()
2012-03-15 03:45:15 +00:00
Gary Bradski
41d2a3c832
Examples of using histograms in python
2012-03-14 23:33:16 +00:00
Gary Bradski
9164ccbaaf
added 0xFF & in front of every waitKey so that it works on linux
2012-03-14 21:46:34 +00:00
Vadim Pisarevsky
191e969243
fixed angle check in squares.py (thanks to Abid Rahman)
2012-03-12 16:45:17 +00:00
Alexander Mordvintsev
58174f6ada
Added GIL-release code into python wrappers
...
Added gabor_threads.py sample
2012-03-07 11:09:27 +00:00
Alexander Mordvintsev
2727a425e4
fixed distrans.py sample (distanceTransform -> distanceTransformWithLabels)
2012-03-06 13:22:55 +00:00
Gary Bradski
778b51a6a1
Adding python example of mouse interaction and use of correlation on an image
2012-02-11 03:47:40 +00:00
Alexander Mordvintsev
39268013d5
frame size specification for video sources in video.py
2011-09-22 12:32:37 +00:00
Alexander Mordvintsev
cd9d695f9d
fix in RectSelector
2011-09-20 11:49:24 +00:00
Alexander Mordvintsev
a869838807
RectSelector in common.py
2011-09-19 06:28:39 +00:00
Alexander Mordvintsev
028c44531f
wrapped FlannBasedMatcher (and extended DescriptorMatcher wrapper)
...
updated feature_homography.py sample to use new features
2011-09-15 11:10:06 +00:00
Alexander Mordvintsev
d50cc51070
handling Ptr<> arguments and return values in Python wrappers
...
partially wrapped features2d framework
added feature_homography.py sample
2011-09-07 09:38:22 +00:00
Alexander Mordvintsev
700ef09a23
opt_flow.py sample fixed
2011-09-02 11:54:02 +00:00
Alexander Mordvintsev
fa7e45897f
obj_detect.py sample removed
2011-09-01 07:25:13 +00:00
Alexander Mordvintsev
e61f4c4a4b
lk_homography.py sample added
2011-08-31 12:33:25 +00:00