Roman Donchenko
029fce10c9
Merge remote-tracking branch 'origin/2.4'
...
Conflicts:
3rdparty/libjasper/CMakeLists.txt
cmake/OpenCVDetectOpenCL.cmake
modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
modules/imgproc/src/floodfill.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/arithm.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/initialization.cpp
modules/ocl/src/matrix_operations.cpp
modules/ocl/src/mcwutil.cpp
modules/ocl/src/opencl/arithm_bitwise_and_mask.cl
modules/ocl/src/opencl/arithm_bitwise_and_scalar_mask.cl
modules/ocl/src/opencl/arithm_bitwise_binary_mask.cl
modules/ocl/src/opencl/arithm_bitwise_binary_scalar.cl
modules/ocl/src/opencl/arithm_bitwise_binary_scalar_mask.cl
modules/ocl/src/opencl/arithm_bitwise_or.cl
modules/ocl/src/opencl/arithm_bitwise_or_scalar.cl
modules/ocl/src/opencl/arithm_bitwise_or_scalar_mask.cl
modules/ocl/src/opencl/arithm_bitwise_xor.cl
modules/ocl/src/opencl/arithm_bitwise_xor_mask.cl
modules/ocl/src/opencl/arithm_bitwise_xor_scalar.cl
modules/ocl/src/stereobm.cpp
modules/ocl/test/precomp.hpp
modules/python/src2/api
modules/ts/src/ts_func.cpp
samples/gpu/bgfg_segm.cpp
2013-05-21 17:19:23 +04:00
Vladislav Vinogradov
49a4f27d42
removed VIBE implementation
2013-05-17 11:27:00 +04:00
Vladislav Vinogradov
ec52096e30
removed VIBE implementation
2013-05-16 13:47:24 +04:00
Vadim Pisarevsky
54afb85d0c
Merge pull request #823 from pickle27:starter_image_sequence
2013-05-14 15:56:35 +04:00
Andrey Kamaev
b8ed00bd64
Compile OpenCV with GCC visibility set to hidden
2013-05-13 18:33:20 +04:00
Andrey Kamaev
60059a7aa0
Improve handling of native_app_glue dependency in Android samples
2013-05-13 17:01:18 +04:00
Vadim Pisarevsky
8130d92602
Merge pull request #841 from Pastafarianist:patch-1
2013-05-12 13:00:23 +04:00
Vadim Pisarevsky
f1e8f69d2c
Merge pull request #861 from albenoit:master
2013-05-12 12:53:14 +04:00
Andrey Pavlenko
2faa2adae2
Merge pull request #846 from smart-mobile-software:tuto_crash
2013-05-07 15:15:16 +04:00
poiuytrez
7dda8e2cb8
Link to bug tracker replaced by bug description
2013-05-07 11:45:18 +02:00
Pastafarianist
d2116f38fe
Fixed typo
2013-05-05 16:17:41 +04:00
poiuytrez
bef6de9025
Fix tuto3 picture taken crash on all devices
...
A modification of the JavaCameraView is needed to avoid a crash when the
app is exited. It is a good practice to remove the callback after the
stopPreview method.
2013-05-01 16:58:15 +02:00
alexandre benoit
9c26387ce0
updated sources to correct buildbot warnings
2013-04-30 17:32:47 +02:00
alexandre benoit
a659e287fb
minor error correction
2013-04-30 14:52:14 +02:00
alexandre benoit
72742f5316
resolved conflicts, updated retina class interface and optimized a heavy retinacolor process
2013-04-29 19:06:35 +02:00
alexandre benoit
9549949228
minor chnges for conflict removal
2013-04-29 15:12:44 +02:00
albenoit
9e1ce1ed52
Merge pull request #2 from albenoit/retina_devel
...
Retina devel
2013-04-27 13:47:30 -07:00
alexandre benoit
ea1a64477f
updated tutorial with new retina interface use
2013-04-27 22:39:28 +02:00
alexandre benoit
b62d101115
updated retina interface for cleaner use, following OpenCV standards
2013-04-27 21:13:45 +02:00
poiuytrez
60bf018781
Fix android tutorial 3 second picture taken bug
2013-04-24 12:38:15 +02:00
Kevin Hughes
69c626e720
starter_video.cpp hid local functions
2013-04-22 22:28:35 -04:00
Kevin Hughes
3441b2df65
starter_video.cpp changed CV WINDOW KEEPRATIO to just WINDOW KEEPTATIO to fix build error
2013-04-22 16:35:23 -04:00
Pastafarianist
28427ce2e8
Fixed typo
2013-04-21 23:04:54 +04:00
Andrey Kamaev
416fb50594
Revert "Merge pull request #836 from jet47:gpu-modules"
...
This reverts commit fba72cb60d
, reversing
changes made to 02131ffb62
.
2013-04-18 15:03:50 +04:00
Vladislav Vinogradov
564f609885
fixed samples compilation
2013-04-18 13:28:34 +04:00
Vladislav Vinogradov
787e56ab5c
disabled gpucodec module on MacOS
2013-04-18 13:28:34 +04:00
Vladislav Vinogradov
5ee9d3111d
fixed gpu tutorial
2013-04-18 13:28:34 +04:00
Vladislav Vinogradov
13d087e62d
videostab module fixes
2013-04-18 13:28:34 +04:00
Vladislav Vinogradov
fdeec6896c
stitching module fixes
2013-04-18 13:28:30 +04:00
Vladislav Vinogradov
ac0f506d0e
split gpuvideo onto gpuoptflow and gpubgsegm
2013-04-18 11:33:34 +04:00
Vladislav Vinogradov
eda124ec32
removed gpuobjdetect module
2013-04-18 11:33:33 +04:00
Vladislav Vinogradov
28b1caa730
gpustereo module for stereo correspondence
2013-04-18 11:33:33 +04:00
Vladislav Vinogradov
fc3730fcc2
gpuwarping module for image warping
2013-04-18 11:33:33 +04:00
Vladislav Vinogradov
508fb6aa5b
renamed gpunvidia -> gpulegacy
2013-04-18 11:33:33 +04:00
Vladislav Vinogradov
a6648b5372
gpuobjdetect module for object detection
2013-04-18 11:33:32 +04:00
Vladislav Vinogradov
b08b9ab83b
gpucalib3d module for camera calibration and stereo correspondence
2013-04-18 11:33:32 +04:00
Vladislav Vinogradov
fc1fa28556
gpuvideo module for video processing
2013-04-18 11:33:32 +04:00
Vladislav Vinogradov
7544ddbfef
gpufeatures2d module 2d for feature detection and matching
2013-04-18 11:33:31 +04:00
Vladislav Vinogradov
e41aea0acf
gpuimgproc module for image processing
2013-04-18 11:33:31 +04:00
Vladislav Vinogradov
229ca0914a
gpunvidia module for NCV & NPP API
2013-04-18 11:33:30 +04:00
Vladislav Vinogradov
84de6ce036
gpufilters module for image filtering
2013-04-18 11:33:30 +04:00
Vladislav Vinogradov
31c8b527c6
gpuarithm module for arithmetics operations on matrices
2013-04-18 11:33:30 +04:00
Vladislav Vinogradov
1b00a3ed54
gpucodec module for video decoding/encoding
2013-04-18 11:33:29 +04:00
Kevin Hughes
47c84335f0
removed starter_image_sequence.cpp
2013-04-17 13:22:37 -04:00
Kevin Hughes
eedb6fa3c4
removed separate example for reading image sequences and modified starter_video.cpp to better explain the functionality of VideoCapture. I also added a bit more explanation in the documentation of the VideoCapture interface
2013-04-17 13:20:32 -04:00
Vladislav Vinogradov
54e7c76d99
fixed compilation errors
2013-04-17 15:24:53 +04:00
Andrey Pavlenko
8c40f0ccf2
fixing build and lint warnings
2013-04-16 15:30:43 +04:00
Andrey Kamaev
8f32902ce6
Minimize usages of legacy C API inside the library
2013-04-16 12:00:02 +04:00
Kevin Hughes
b141762070
added an example of using cv::VideoCapture to read image sequences like 000.pmg, 001.png ... 100.png etc.
2013-04-15 13:21:20 -04:00
Andrey Kamaev
f886651cf0
Drop old python samples and tests
2013-04-12 19:37:40 +04:00
Andrey Kamaev
909d6fcf51
Move legacy part of opencv_contrib to separate header
2013-04-12 19:37:40 +04:00
Andrey Kamaev
3b364330ad
Merge branch '2.4'
2013-04-12 15:35:38 +04:00
Andrey Kamaev
abe2ea59ed
Merge pull request #802 from SpecLad:shebang
2013-04-12 15:00:28 +04:00
Andrey Kamaev
8406312571
Remove C API from OpenCL module
2013-04-12 14:37:02 +04:00
Andrey Kamaev
5e048d1fa5
Move C API of opencv_objdetect to separate file
...
Also move cv::linemod to own header
2013-04-12 14:37:01 +04:00
Andrey Kamaev
e5a33723fc
Move C API of opencv_calib3d to separate file
2013-04-11 21:00:17 +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
Kirill Kornyakov
53a06913cb
Minor code cleanings in lkdemo.cpp
2013-04-11 17:57:33 +04:00
Kirill Kornyakov
e351538697
#2813 bugfix
2013-04-11 17:50:10 +04:00
Andrey Kamaev
199a35a105
Move C API of opencv_video to separate file
2013-04-11 17:38:33 +04:00
Andrey Kamaev
7711fe2f43
Merge pull request #794 from asmorkalov:android_no_layout
2013-04-11 11:34:42 +04:00
Andrey Kamaev
c98c246fc2
Move border type constants and Moments class to core module
2013-04-10 19:14:24 +04:00
Alexander Smorkalov
82c61eba49
Feature #2893 Create Java sample without layout.xml implemented.
2013-04-10 13:38:59 +04:00
Andrey Kamaev
71896544ca
Merge pull request #789 from asmorkalov:android_na_mk_fix
2013-04-09 13:14:22 +04:00
Vladislav Vinogradov
ba1a1aecaa
fixed gpu module compilation
2013-04-09 10:41:35 +04:00
Alexander Smorkalov
7bd169caa9
Native activity build with Android.mk fixed.
2013-04-09 10:17:22 +04:00
Andrey Kamaev
dd74a851f3
Fix build errors
2013-04-08 17:10:31 +04:00
Andrey Kamaev
69648f0a6f
Make photo.hpp independent from C API
2013-04-08 15:47:29 +04:00
Andrey Kamaev
0738ea7d0f
Make highgui.hpp independent from C API
2013-04-08 15:47:29 +04:00
Andrey Kamaev
288a0634c2
Make imgproc.hpp independent from C API
2013-04-08 15:47:28 +04:00
Andrey Kamaev
6ef43cd96e
Merge pull request #779 from sivapvarma:master
2013-04-08 10:11:33 +04:00
Andrey Kamaev
5cfb6a848e
Merge pull request #780 from sivapvarma:2.4
2013-04-08 10:11:16 +04:00
Andrey Kamaev
67073daf19
Merge branch '2.4'
2013-04-05 21:11:59 +04:00
Siva Prasad Varma
e2df8c7e62
Fix bug #2590
...
replaced wrong check to correct check
2013-04-05 19:09:09 +05:30
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
Alexander Smorkalov
f89cc191a4
Waning fixes for Android samples
2013-04-05 12:17:45 +04:00
Alexander Shishkov
35f75147b0
removed willowgarage.com links
2013-04-04 14:33:00 +04:00
Alexander Shishkov
382695ba5a
removed links to the http://opencv.willowgarage.com/
2013-04-04 13:44:28 +04:00
Alexander Smorkalov
3929a43873
Native activity install fixed.
2013-04-03 14:43:23 +04:00
Andrey Kamaev
c979de1eed
Rewrite Mat formatting without std streams
2013-04-03 11:55:19 +04:00
Vladislav Vinogradov
9086efa8e9
fixed warnings
2013-04-02 13:24:00 +04:00
Andrey Kamaev
517062039e
Make core/internal.hpp a private header
2013-04-01 17:29:10 +04:00
Andrey Kamaev
3890a74565
Drop outdated definitions from internal.hpp
...
This also fixes few clang build errors
2013-04-01 15:24:35 +04:00
Andrey Kamaev
71e43852ce
Fix MSVC build issues
2013-04-01 15:24:34 +04:00
Andrey Kamaev
2b1ef95415
Completely separate C and C++ API of OpenCV core
2013-04-01 15:24:34 +04:00
Andrey Kamaev
715fa3303e
Move cv::Mat out of core.hpp
2013-04-01 15:24:34 +04:00
Andrey Kamaev
5e7ab8baf3
Move cv::Scalar_ to types.hpp
2013-04-01 15:24:33 +04:00
Andrey Kamaev
13b31b0804
Move C++ basic structures to separate header and inverse dependency from C API
...
cv::Complex, cv::Point_ and cv::Point3_ are moved.
2013-04-01 15:24:32 +04:00
Andrey Kamaev
2a1cf23fab
Merge pull request #713 from bitwangyaoyao:2.4_perf
2013-04-01 15:16:48 +04:00
Alexander Smorkalov
f2fe89c6d8
CMakeLists.txt for Android native activity added.
2013-04-01 12:38:26 +04:00
Dustin Spicuzza
b08432cfe7
Port dft.py sample from cv to cv2
2013-03-29 17:37:00 -04:00
Andrey Kamaev
f77a375354
Merge branch '2.4'
2013-03-29 19:38:35 +04:00
yao
5539e85a11
use perf test replace performance sample
2013-03-27 12:04:48 +08:00
Andrey Kamaev
20534c9beb
Merge pull request #692 from vpisarev:refactor_calib3d_stereo
2013-03-26 18:38:16 +04:00
Andrey Kamaev
f282498b1d
Drop outdated targets and fix solution folders
2013-03-25 21:57:53 +04:00
Andrey Kamaev
29cfeb7cee
Fix build of apps and samples
2013-03-22 22:14:36 +04:00
Andrey Kamaev
82d7292ee7
Merge pull request #680 from vpisarev:c2cpp_video_take2
2013-03-22 19:34:53 +04:00
Vadim Pisarevsky
7661625c39
converter stereo correspondence algorithms to the new style
2013-03-22 01:05:30 +04:00
Andrey Kamaev
1ca8f33b4e
Merge branch '2.4'
2013-03-21 23:11:54 +04:00
Andrey Kamaev
1b4afcca30
Move OpenCl SURF perf tests to nonfree and fix build of samples
2013-03-21 18:19:52 +04:00
Andrey Kamaev
40c26e21d2
Merge pull request #662 from asmorkalov:android_native_activity
2013-03-21 14:47:14 +04:00
Vadim Pisarevsky
321070ccf0
Merge pull request #669 from vpisarev:fast_lin_svm
2013-03-21 12:22:36 +04:00
Vadim Pisarevsky
07e0f7bf59
refactored video module; use the new-style algorithms now
2013-03-20 19:51:49 +04:00
Andrey Kamaev
89356ff16d
Move non-CV functionality from core.hpp to separate utility.hpp header
2013-03-20 17:56:06 +04:00
Vadim Pisarevsky
24c614f686
added load/save feature for SVM classifier in letter_recog sample
2013-03-19 18:41:38 +04:00
Vadim Pisarevsky
a06af5ca25
dramatic speedup of SVM::predict in the case of linear SVM
2013-03-19 18:28:17 +04:00
Alexander Smorkalov
b37d65ff2b
Code refactoring was done.
2013-03-18 17:36:48 +04:00
Vladislav Vinogradov
0a65f2f4af
merged gpunonfree and nonfree module
2013-03-18 16:14:37 +04:00
cuda-geek
3f8d87d82c
Merge pull request #661 from cuda-geek:merge-cpu-gpu-detections
2013-03-18 15:34:02 +04:00
Vladislav Vinogradov
fd7bf0b766
moved SURF_GPU and VIBE to gpunonfree module
2013-03-18 14:06:29 +04:00
Alexander Smorkalov
dc2bca0772
Initialization with Manager instead static link added.
2013-03-18 10:37:11 +04:00
Alexander Smorkalov
436d9bbcbb
Base for Native Activity example added.
2013-03-18 10:37:11 +04:00
marina.kolpakova
0211843062
merge Detection structure for CPU and GPU soft cascade detectors
2013-03-18 06:58:53 +04:00
cuda-geek
819ac111a2
Merge pull request #660 from Nerei:2.4
2013-03-17 23:00:04 +04:00
Vadim Pisarevsky
959a5c980d
Merge pull request #532 from jet47:super-resolution
2013-03-17 19:13:37 +04:00
Anatoly Baksheev
2bf3104ee5
bugfix in sample to support LBP classifier. To merge to master also.
2013-03-17 18:43:55 +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
Andrey Kamaev
a1c456b7c3
Extract common base header for C and C++ APIs
2013-03-15 10:38:38 +04:00
Andrey Kamaev
18ca645fd2
Merge pull request #631 from bitwangyaoyao:2.4_stereo
2013-03-15 10:34:27 +04:00
marina.kolpakova
157a98edf7
refactored cuda error handling; remove optional dependancies in soft cascade training app
2013-03-14 23:43:03 +04:00
marina.kolpakova
a476664144
fixed compilation with latest master changes
2013-03-14 20:12:52 +04:00
marina.kolpakova
5120322cea
move gpu version of soft cascade to dedicated module
2013-03-14 12:27:13 +04:00
Andrey Kamaev
d9cd753835
Merge pull request #645 from taka-no-me:bump_headers
2013-03-14 11:42:23 +04:00
Andrey Kamaev
7d0938d481
Merge pull request #640 from cuda-geek:soft-cascade-sample
2013-03-14 11:41:17 +04:00
Andrey Kamaev
ad5cddc007
Main module headers are moved 1 level up
...
e.g. <opencv2/core/core.hpp> become <opencv2/core.hpp>
Also renamed <opencv2/core/opengl_interop.hpp> to <opencv2/core/opengl.hpp>
2013-03-13 17:26:56 +04:00
marina.kolpakova
b4b63cd698
add softcascade to people detector sample
2013-03-13 07:39:50 +04:00
Andrey Kamaev
9f3ce0dd97
Reword and merge pull request #625 from jet47/gpu-fixes
2013-03-12 18:14:23 +04:00
Vladislav Vinogradov
ecb2ebfba4
Move opengl iterop code to cv::ogl namespace
...
Fixed issues: #2737 #2848
2013-03-12 18:13:11 +04:00
Andrey Kamaev
fb04f3a58d
Merge pull request #622 from moshekaplan:python2_cleanups
2013-03-11 21:14:20 +04:00
yao
0f0a4c3099
add stereoBM function
2013-03-11 17:10:58 +08:00
Alexander Smorkalov
8942eaf0d7
Stetch support for Android View classes added (Feature #2840 )
2013-03-11 11:17:19 +04:00
Moshe Kaplan
bd042d9cc3
Fixed shebangs, added error checking
2013-03-06 01:41:02 -05:00
Andrey Kamaev
816adcfdac
Merge pull request #605 from vpisarev:c2cpp_calib3d_stereo
2013-03-05 15:26:51 +04: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
Andrey Kamaev
9e12b7c3c2
Merge release 2.4.4
2013-03-04 19:43:49 +04:00
Vadim Pisarevsky
df89f30b4a
removed preset parameter in createStereoBM, updated stereo_match sample
2013-03-02 02:17:49 +04:00
Andrey Kamaev
e6cb44edc3
Merge pull request #600 from taka-no-me:fix_build_warnings
2013-03-01 17:09:56 +04:00
Andrey Kamaev
22d33373fa
Fix build warnings on MSVC x64 and OS X clang
2013-03-01 13:29:43 +04:00
Andrey Kamaev
eaaba1336a
Merge pull request #595 from bitwangyaoyao:2.4_perfTest
2013-03-01 12:49:43 +04:00
yao
8f3883a28d
fix a compile warning
2013-03-01 10:06:51 +08:00
Andrey Pavlenko
af2552d72c
fixing issues from http://www.code.opencv.org/issues/2807
2013-02-28 19:11:24 +04:00
Andrey Kamaev
79cf292d78
Merge pull request #590 from apavlenko:java_fixes
2013-02-28 18:07:33 +04:00
Andrey Kamaev
2a73a6c445
Merge pull request #525 from odeniz:2.4
2013-02-28 18:05:55 +04:00
Andrey Pavlenko
c24d7cc066
adding more version-related variables
2013-02-28 16:56:53 +04:00
Andrey Pavlenko
29b763dc60
updating samples to load JNI lib with correct suffix
2013-02-28 16:24:52 +04:00
Andrey Kamaev
bf4c8c6ff1
Merge pull request #584 from bitwangyaoyao:2.4_perfTest
2013-02-28 15:44:06 +04:00
Andrey Kamaev
891d7da6ee
Merge branch '2.4'
2013-02-28 11:17:06 +04:00
yao
ed3c3822fc
adjust some test cases, use original template file name in Haar
2013-02-28 12:15:13 +08:00
Georgios Evangelidis
f40725bb50
Add ECC algorithm
...
Evangelidis, G.D. and Psarakis E.Z. "Parametric Image Alignment using Enhanced
Correlation Coefficient Maximization", IEEE Transactions on PAMI, vol. 32, no.
10, 2008
2013-02-28 01:48:00 +04:00
Andrey Kamaev
5b7a4cd955
Merge pull request #579 from bitwangyaoyao:2.4_perfTest
2013-02-27 19:34:17 +04:00
yao
bf427c01c1
adjust matchTemplate in performance sample, as current version is too slow when template size isn't small
2013-02-27 21:41:04 +08:00
Vladislav Vinogradov
7a0d6f7733
Super Resolution module
2013-02-27 13:41:15 +04:00
Andrey Kamaev
c54c7c8b2c
Merge pull request #553 from bitwangyaoyao:2.4_perfTest
2013-02-27 11:36:23 +04:00
yao
6409a4b112
fix the compile warnings
2013-02-27 11:16:46 +08:00
yao
e3a715882e
fix the mismatch of perf_test, add a performance sample for ocl module
2013-02-26 16:52:30 +08:00
Alexander Smorkalov
11885e86ee
Feature #2833 Sepia size in Image Manipulations demo implemented.
2013-02-26 11:25:33 +04:00
Andrey Kamaev
2a6fb2867e
Remove all using directives for STL namespace and members
...
Made all STL usages explicit to be able automatically find all usages of
particular class or function.
2013-02-25 15:04:17 +04:00
Oscar Deniz Suarez
07ea88b8c6
Update samples/c/smiledetect.cpp
...
Fixed isdigit() Android build error
2013-02-22 16:23:42 +01:00
Andrey Kamaev
0b8a6da817
Merge branch '2.4'
2013-02-22 17:33:30 +04:00
Oscar Deniz Suarez
8cfba6456b
Update samples/c/smiledetect.cpp
...
- Changed to floating neighbor maximum mode
- Fixed some previous errors.
2013-02-21 22:55:28 +01:00
Oscar Deniz Suarez
379dcf87d5
Added smile detector
2013-02-21 17:17:34 +01:00
Vladislav Vinogradov
8b1f88c40f
updated gpu module API
2013-02-21 16:12:33 +04:00
Andrey Kamaev
afa993316f
Merge pull request #502 from jet47:opengl-updates
2013-02-21 15:12:43 +04:00
Vladislav Vinogradov
a938534a7e
restored binary compatibility
2013-02-21 12:18:08 +04:00
Andrey Kamaev
637397f621
Merge branch '2.4'
2013-02-20 12:31:16 +04: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
Vladislav Vinogradov
e06c3ec7c5
updated OpenGL functionality:
...
* removed OpenGLFuncTab, now extensions are loaded internally
* added support of GlBuffer and GlTexture2D to InputArray/OutputArray
* added ELEMENT_ARRAY_BUFFER and PIXEL_PACK_BUFFER targets
* added copyFrom/copyTo method for GlBuffer and GlTexture2D
* removed GlFont
* removed pointCloudShow
* removed OpenGLCleanCallback
* added Access parameter to GlBuffer::mapHost
* added autoRelease parameter to all create methods
2013-02-19 14:13:11 +04:00
Andrey Kamaev
262fc929aa
Merge branch '2.4'
2013-02-18 15:35:42 +04:00
Andrey Kamaev
7e5eee5bf1
Merge pull request #301 from emchristiansen:javasample2.4
2013-02-15 18:38:25 +04:00
Andrey Pavlenko
2853bab471
converting images to PNG
2013-02-15 16:46:30 +04:00
Andrey Pavlenko
edb15dee3d
review feed-back considered
2013-02-15 16:33:13 +04:00
Andrey Pavlenko
a8c2fc6908
changing layout, adding ant and eclipse sections, more pictures
2013-02-14 17:54:37 +04:00
Vladislav Vinogradov
a3a09cf4d1
refactored OpticalFlowDual_TVL1:
...
* added DenseOpticalFlow interface
* moved OpticalFlowDual_TVL1 to src folder
2013-02-14 13:26:47 +04:00
Vladislav Vinogradov
aa73bf6079
added gpu optical flow sample
2013-02-13 15:58:12 +04:00
Vladislav Vinogradov
fe2e89df1b
added gpu::HoughLinesP function
2013-02-13 15:56:58 +04:00
Vladislav Vinogradov
1498d2f427
added dual tvl1 optical flow implementation
2013-02-13 15:42:58 +04:00
Andrey Kamaev
b44b920997
Merge branch '2.4'
2013-02-12 16:30:18 +04:00
Alexander Smorkalov
d067dc5a05
Code review notes fixed.
2013-02-11 11:36:12 +04:00
Alexander Smorkalov
9a2d6f854b
Tutorial-1-Java -> Tutorial-1-CameraPreview
...
Issues fix.
2013-02-08 13:13:37 +04:00
Alexander Smorkalov
507e2dc0ad
Project files for Eclipse updated.
2013-02-08 12:50:58 +04:00
Alexander Smorkalov
b558bb4894
Tutorial-5 -> Tutorial-3
2013-02-08 12:50:58 +04:00
Alexander Smorkalov
902463b6e9
Tutorial4 sample renamed to Tutorial-2-MixedProcessing
2013-02-08 12:50:07 +04:00
Alexander Smorkalov
08cd51df1f
Tutorial-3 removed as dublicate part of tutorial-4.
2013-02-08 12:47:45 +04:00
Alexander Smorkalov
b943277559
Tutorial-2 removed as dublicate of tutorial-1 and image manipulations sample.
2013-02-08 12:47:23 +04:00
Alexander Smorkalov
33502c86ac
Tutorial 1 renamed
2013-02-08 12:45:48 +04:00
Alexander Smorkalov
076941bb07
15-puzzle app reverted to usage of old CvCameraViewListener implementation;
...
super.onPause() call moved to begining of onPause method according Google recomandations.
2013-02-08 12:36:33 +04:00
Alexander Smorkalov
f8720ec60e
Code review issues fixed. Compatibility issues fixed.
2013-02-07 13:11:08 +04:00
Alexander Smorkalov
6b5eac328f
Android samples updated according onCameraFrame callback signature change.
...
FpsMeter class removed from Image Manipulations and Face Detection examples as unused code.
2013-02-04 17:43:46 +04:00
cuda-geek
6b4304efda
Merge pull request #388 from ivan-korolev:fix_cmd_line_parsing_in_samples
2013-01-31 17:15:14 +04:00
Andrey Kamaev
57d3152cd0
Merge branch '2.4'
2013-01-31 14:35:27 +04:00
Ivan Korolev
36451319c1
fixed cmd line parsing in the samples
2013-01-31 12:08:43 +04:00
Andrey Kamaev
f489eb9a5d
Fix build warnings in OpenCL samples
2013-01-30 17:25:03 +04:00
Andrey Kamaev
7572b4d400
Merge branch '2.4'
2013-01-30 15:12:50 +04:00
Andrey Kamaev
68be50bbab
Fix clang build warning
2013-01-30 13:31:00 +04:00
Andrey Kamaev
9690ed8232
Fix build of OpenCV samples (Linux)
2013-01-30 12:48:01 +04:00
Vadim Pisarevsky
c69312ea0d
fixed #2580 , #2210 . some work on #2025 .
...
modified SIFT to 1) double image before finding keypoints, 2) use floating-point internally instead of 16-bit integers, 3) set the keypoint response to the abs(interpolated_DoG_value). step 1) increases the number of detected keypoints significantly and together with 2) and 3) it improves some detection benchmarks. On the other hand, the stability of the small keypoints is lower, so the rotation and scale invariance tests now struggle a bit. In 2.5 need to make this feature optional and add some more intelligence to the algorithm.
added test that finds a planar object using SIFT.
2013-01-29 19:38:56 +04:00
cuda-geek
11dfceb2c9
Merge pull request #328 from jet47:new-gpu-fixes
2013-01-29 11:00:37 +04:00
Andrey Kamaev
f4e27bcbbc
Merge branch '2.4'
2013-01-25 16:30:36 +04:00
Andrey Kamaev
d5b15d6523
Fix ocl build warnings
2013-01-24 17:08:30 +04:00
Stefan Romberg
9f417268b3
Fixed visualization by choosing the color appropriate to the detection
...
Fixed visualization by choosing the color appropriate to the detection
score.
Previously the example showed all detections with the same color
disregarding the confidence. This led to the impression that the object
detection did not work at all because there are many detections with low
confidences.
PR to master was
https://github.com/Itseez/opencv/pull/320
2013-01-24 10:01:18 +01:00
Vladislav Vinogradov
ae6266e101
fixes for gpu module:
...
- fixed printCudaDeviceInfo for new CC
- fixed some compilation errors and warnings
- removed unset command from CMake script
- removed unused std imports
2013-01-23 21:05:06 +04:00
Vadim Pisarevsky
dc4d0398f3
converted few more comp. geometry functions to C++
2013-01-22 16:54:31 +04:00
Eric Christiansen
6169b1dc90
Adds samples for Java and Scala
2013-01-15 12:03:55 -08:00
Vadim Pisarevsky
b68df415a9
Merge pull request #135 from nevion:master
2013-01-10 16:43:45 +04:00
marina.kolpakova
45191dd6a5
merge CUDA dev branch
2012-12-29 19:44:38 +04:00
Anatoly Baksheev
389ecbe96d
warnings, renamed Marina's GPU_PERF_TEST_P
2012-12-25 22:00:20 +04:00
Andrey Kamaev
132b5d6435
Merge release 2.4.3.2
2012-12-25 19:07:08 +04:00
Andrey Pavlenko
dd8e648d78
hiding empty menu button on Android 4
2012-12-25 17:49:10 +04:00
Andrey Kamaev
13b6a3a15e
Merge branch 2.4
2012-12-24 17:10:07 +04:00
Vladislav Vinogradov
5138b7d209
Merge branch 'master' into cuda-dev
2012-12-24 13:48:33 +04:00
Andrey Kamaev
9944282b09
Fix build with STLPort from NDK r8d
2012-12-22 00:59:56 +04:00
Andrey Kamaev
962884cdec
Merge branch 2.4
2012-12-21 17:58:48 +04:00
Alexander Smorkalov
77df8730ef
Tutorial-5 sample extended.
...
Application menu reorganized;
Resolution control added.
2012-12-20 11:16:34 +04:00
Alexander Smorkalov
1555922228
OpenCV for Android SDK installation improved;
...
ReadMe.txt for OpenCV Manager added;
share folder excluded from SDK.
2012-12-19 17:28:46 +04:00
Vladislav Vinogradov
41c9377db0
fixed warnings under windows
2012-12-18 18:03:54 +04:00
Anatoly Baksheev
680eeecc3b
fixed samples compilation
2012-12-17 13:19:26 +04:00
Vladislav Vinogradov
1a1f454241
updated gpu houghlines sample
2012-12-17 11:15:45 +04:00
Vladislav Vinogradov
da017fbeb9
fast optical flow bm implementation
2012-12-17 10:39:19 +04:00
Vadim Pisarevsky
2a42960ff2
Merge branch 'master' of https://github.com/nevion/opencv into cc
2012-12-15 21:45:55 +04:00
Andrey Kamaev
f5cd20d80b
Merge branch 2.4
2012-12-14 14:46:41 +04:00
Vladislav Vinogradov
caf91ac159
new gpu::HoughLinesP implementation
2012-12-13 17:18:25 +04:00
Vladislav Vinogradov
da93a1dab9
fixed build for CARMA platform
2012-12-13 13:49:32 +04:00
marina.kolpakova
a6c3ed5b36
Merge branch master into cuda-dev
2012-12-11 01:12:14 +04:00
Jason Newton
6a4d881a78
use vector instead of non-standard stack allocation. also correct program argument borkage
2012-12-08 23:09:05 -08:00
Alexander Smorkalov
d550f95347
Date and time added to saved file name.
2012-12-07 14:46:53 +04:00
Vladislav Vinogradov
aad76090ce
gpu::HoughLinesP
2012-12-06 15:14:20 +04:00
Vladislav Vinogradov
05d842bcd8
a bit more opengl refactoring:
...
* added Access parameter to GlBuffer::mapHost
* added autoRelease parameter to all create methods
* fixed indentation in gl_core_3_1
* minor improvments for opengl sample
2012-12-03 13:11:06 +04:00
Andrey Kamaev
e10ee89ec4
Merge branch 2.4
2012-11-30 19:54:24 +04:00
Alexander Smorkalov
22484872fa
Sample Tutorial-5 improved
...
Aditional toasts added;
Exception handling improved;
Bitmap recycling added.
2012-11-30 18:41:46 +04:00
Vladislav Vinogradov
08fbf667f9
refactored opengl functionality
...
* removed OpenGLFuncTab, now extensions are loaded internally
* renamed GlTexture -> GlTexture2D
* added support of GlBuffer and GlTexture2D to InputArray/OutputArray
* added ELEMENT_ARRAY_BUFFER and PIXEL_PACK_BUFFER targets
* added copyFrom/copyTo method for GlBuffer and GlTexture2D
* removed GlFont
* removed pointCloudShow
* removed OpenGLCleanCallback
2012-11-30 17:35:28 +04:00
Andrey Kamaev
60a98aa5f7
Merge pull request #199 from apavlenko/remove_android_tutorial0
...
removing Android tutorial 0
2012-11-30 01:20:07 -08:00
Andrey Pavlenko
ea83d384c1
removing Android tutorial 0 since it has become irrelevant after moving to the new application framework
2012-11-30 12:32:16 +04:00
Alexander Smorkalov
d36f8b9eb3
Code review comments applied
...
Sample renamed to CameraControl;
Picture taking added to show camera preview restart.
2012-11-29 18:26:57 +04:00
Alexander Smorkalov
86f7a357ae
Tutorial-5 functionality implemented.
2012-11-27 18:06:43 +04:00
Alexander Smorkalov
24c920a33a
Base for new sample added.
2012-11-27 18:06:43 +04:00
Jason Newton
00bdca7684
A few changes to comply with upstream requirements for merge.
...
-Change input/output order from (out Labeled, in Image) -> (in Image, Out Labeled) and convert
to Input/OutputArrays in the process.
-Adopt OutputArray for statistics export so that the algorithm is "wrapper friendly" and not requiring a new struct in
language bindings at the expense of using doubles for everything and slowing statistics computation down..
2012-11-27 02:31:38 -08:00
Alexander Smorkalov
e95fc27490
Samples updated
...
In tutorial-1 fps meter enabled via layout.xml. Camera id is set to "any" via lauout.xml;
In tutorial-2 message moved ion the bottom of the screen.
2012-11-27 12:47:41 +04:00
marina.kolpakova
209f16455d
Merge cuda-geek/soft-cascade-gpu into cuda-dev
2012-11-26 19:15:02 +04:00
marina.kolpakova
1712d0930c
Merge origin/master into cuda-dev
2012-11-26 18:56:33 +04:00
Andrey Pavlenko
b19f672843
( #2569 ) simplifying code to avoid Eclipse CDT editor confusion, removing warnings and typos in comments
2012-11-26 17:32:10 +04:00
Andrey Kamaev
23011ffd81
Merge pull request #179 from cuda-geek:usr-bin-env-python
2012-11-24 19:24:01 +04:00
marina.kolpakova
285d6320be
add #/usr/bin/env python to all python files
2012-11-23 22:57:22 +04:00
Alexander Smorkalov
2c67731a7b
Issue #2549 OpenCV Samples does not expand on full screen fixed.
...
All samples use application style in android manifest instead of system calls in onCreate event now.
2012-11-23 13:12:11 +04:00
Andrey Kamaev
7f542e391a
Merge branch 2.4
...
Conflicts:
android/service/engine/AndroidManifest.xml - use file from 2.4
modules/contrib/src/detection_based_tracker.cpp - move #include <pthread.h> as in 2.4
modules/java/android_test/src/org/opencv/test/OpenCVTestRunner.java - use file from 2.4
2012-11-20 19:12:00 +04:00
Andrey Kamaev
d559c18ee5
Merge pull request #161 from apavlenko:fix/sdk_r21
2012-11-20 19:07:08 +04:00
Andrey Pavlenko
cfd634ca3e
Improving compatibility with the latest Android SDK (r21) and NDK (r8c).
...
- Adding Android SDK/ADT r21 compatibility;
- fixing stl headers path for new ndk;
- fixing native API level for Android projects
2012-11-20 18:40:22 +04:00
Andrey Kamaev
04481d9ef4
Fix Android build with clang compiler
2012-11-20 15:20:04 +04:00
marina.kolpakova
c3e4a52fbe
soft cascade sample
2012-11-14 20:11:18 +04:00
Andrey Kamaev
9719ea93b6
Merge branch 2.4
2012-11-13 19:54:48 +04:00
Andrey Kamaev
aba5bae400
Merge pull request #147 from taka-no-me/win_warnings
2012-11-13 19:48:59 +04:00
Andrey Kamaev
a218507586
Merge pull request #148 from taka-no-me/tutorial_codes
2012-11-13 18:20:49 +04:00
marina.kolpakova
d65b3e0617
fix warning in CUDA samples
2012-11-10 04:59:55 +04:00
Andrey Kamaev
dad56e202f
Rename sample & tutorial executables
2012-11-09 10:15:48 +04:00
Andrey Kamaev
b131dfeecd
Build tutorial codes together with other samples
...
These codes should be included into regular builds.
2012-11-09 10:15:48 +04:00
Andrey Kamaev
0a4ed2bc01
Fix Windows build warnings
2012-11-09 10:10:04 +04:00
Alexander Smorkalov
91a9923dcf
Face detection package name replaced on org.opencv.facedetect for consistency with Google Play package.
2012-11-09 09:40:19 +04:00
Alexander Smorkalov
95b7f5c46c
Face Detection sample namespace replaced on org.opencv.facedetect for consistency with Google Play.
2012-11-07 13:27:33 +04:00
Jason Newton
4c0cb2576d
connectedComponents: peep-hole optimizations, mostly surrouding the fact that cv::Mat::at is expensive in a tight-loop -also added a "blobstats" version
2012-11-05 08:10:35 -08:00
Jason Newton
45b4f4f32b
connectedComponents: warning free version
2012-11-05 08:10:29 -08:00
Vladislav Vinogradov
beb377b38c
gpu implementation of Dual TV-L1 Optical Flow
2012-11-02 19:51:43 +04:00
Andrey Kamaev
4d059e9e5b
Merge release 2.4.3
2012-11-02 17:58:02 +04:00
marina.kolpakova
9b92de9a88
Merge pull request #121 from branch asmorkalov:android_samples_fix
2012-11-01 19:11:53 +04:00
Alexander Smorkalov
a1a2cb0aeb
OpenCV Samples testing problems fixed:
...
Memory leak in color-blob-detection sample fixed;
Default face size in face-detection is set to 20%;
Error handling improved;
Some possible mat leak fixed;
Manager verison and engine interface version incremented to fix incompatibilities;
Docs updated;
2012-10-31 17:24:50 +04:00
Andrey Kamaev
66b90d19a6
Merge pull request #81 from stephenfox/master
2012-10-31 16:59:45 +04:00
Andrey Kamaev
f15e49041e
Merge pull request #112 from taka-no-me/warnings
2012-10-31 16:51:35 +04:00
Andrey Kamaev
468eefe0ce
Merge branch '2.4'
2012-10-30 15:10:17 +04:00
alexandre benoit
3fb90abb76
added retina code tutorial
2012-10-30 15:06:13 +04:00
Alexander
d495daf1ed
Memory leak of native OpenCV mats fixed.
2012-10-29 16:56:21 +04:00
Alexander Smorkalov
83d8bc8c55
Tutorial 1 updated. Execution time camera switching implemented.
...
Some unification done to simplify camera switching.
2012-10-26 13:30:20 +04:00
Vladislav Vinogradov
0ad849d2fd
Dual TV-L1 optical flow implementation
2012-10-25 11:25:35 +04:00
Andrey Kamaev
673aa91bac
Fix remaining windows build warnings
2012-10-24 20:27:20 +04:00
Andrey Kamaev
6211f156e6
Merge 2.4.3-rc
2012-10-24 19:56:27 +04:00
alexandre benoit
b5bd86b2a7
added retina code tutorial
2012-10-24 12:20:59 +02:00
Alexander Smorkalov
76bcf72ded
2.4.3 version support added to OpenCV Manager. Docs updated. Samples updated.
2012-10-24 09:51:01 +04:00
Alexander Smorkalov
c1d42664bc
Refactring. Bug fix.
2012-10-23 20:06:58 +04:00
Alexander Smorkalov
a942747046
Code review coments fixed. Lint wornings fixed.
2012-10-23 20:06:58 +04:00
Alexander Smorkalov
4c06d0834e
camera-preview sample removed from CMakeLists.txt
2012-10-23 20:06:58 +04:00
Alexander Smorkalov
84856fa2c1
CMakeLists.txt rescued. Androidmanifest unified.
2012-10-23 20:06:58 +04:00
Alexander Smorkalov
a5ee07d340
Image manipulations sample ported on new framework.
2012-10-23 20:06:58 +04:00
Alexander Smorkalov
898320a0f6
Code clean up.
2012-10-23 20:06:58 +04:00
Alexander Smorkalov
c64ee44c9e
Color blob detection sample ported on new framework.
2012-10-23 20:06:33 +04:00
Alexander Smorkalov
2fd8b51a26
Face detection sample ported on new framework.
2012-10-23 20:06:33 +04:00
Alexander Smorkalov
d9ea16ce57
Tutorial1 ported on new framework.
2012-10-23 20:06:33 +04:00
Alexander Smorkalov
873f47654a
Tutorial2 ported on new framework.
2012-10-23 20:06:33 +04:00
Alexander Smorkalov
31763bdcf0
Tutorial3 ported on new framework.
2012-10-23 20:06:33 +04:00
Alexander Smorkalov
50500e5923
Tutorial4 ported on new sample framework.
2012-10-23 20:06:33 +04:00
Alexander Smorkalov
9029acf6f0
openCV application framework moved to modules/java/... folder. Now it is part of OpenCV SDK.
2012-10-23 20:06:33 +04:00
Alexander Smorkalov
68ab3d5be6
Processing thread added to Java camera view.
2012-10-23 20:06:32 +04:00
Alexander Smorkalov
8393fd0c9d
Auto focus added;
...
Old Android support added;
Android 4.1.x fixes added;
Thead sync added;
Camera errors handling added.
2012-10-23 20:06:32 +04:00
Alexander Smorkalov
f8bcff8ff3
Device rotation support added;
...
Nexus 7 support added.
2012-10-23 20:05:16 +04:00
Alexander Smorkalov
09901fae2b
OnResume/OnPause handlers added to start/stop camera.
...
OpenCV initialization moved to onResume event to support package installation waiting.
2012-10-23 20:05:16 +04:00
Alexander Smorkalov
cc3430dbcc
Naming fixed;
...
Warnings fixed;
Nexus 7 support added to manifest.
2012-10-23 20:04:09 +04:00
Konstantin Bezruk
cd152c3a03
Puzzle15 implementation with use of the OpenCV surface framework
2012-10-23 20:02:46 +04:00
Alexander Smorkalov
5f1339b319
Menu and style removed from sample.
2012-10-23 20:02:46 +04:00
Andrey Pavlenko
a32004f90c
adding initial version of a sample with new Camera-View handling design
2012-10-23 20:01:23 +04:00
Stephen Fox
9f8ce906f4
fix to documentation regarding CV_CAP_OPENNI_* in high gui userguide
...
fix comments to accurate match CV_CAP_OPENNI_* vs. wrong OPENNI_*
2012-10-22 23:18:46 -05:00
Andrey Kamaev
57775988e7
Merge branch '2.4'
2012-10-22 16:57:56 +04:00
Andrey Kamaev
8fb6d9f650
Fix Android build warnings
2012-10-19 16:14:14 +04:00
Andrey Kamaev
0e7ca71dcc
Normalize whitespace in documentation and text files
2012-10-17 21:42:09 +04:00
OpenCV Buildbot
81f826db2b
Normalize line endings and whitespace
2012-10-17 15:57:49 +04:00
OpenCV Buildbot
04384a71e4
Normalize line endings and whitespace
2012-10-17 15:32:23 +04:00
Andrey Kamaev
f4e33ea0ba
Fix build of samples
2012-10-17 02:09:46 +04:00
Andrey Kamaev
7225f89ea2
Revert opencv_videostab to the state of 2.4.2
2012-10-17 02:09:43 +04:00
Andrey Kamaev
26bcb3812c
Fix binary compatibility of opencv_contrib
2012-10-17 02:09:28 +04:00
Andrey Kamaev
d566c6bc86
Revert "add new version of CommandLineParser. add empty docs"
...
This reverts commit 54a202b3d5
.
Conflicts:
modules/core/doc/command_line_parser.rst
modules/core/include/opencv2/core/core.hpp
modules/core/src/cmdparser.cpp
modules/gpu/perf/main.cpp
modules/gpu/test/main.cpp
modules/ts/src/ts_perf.cpp
2012-10-15 20:01:44 +04:00
Andrey Kamaev
dbd30d4fba
Revert "fixing Java test and sample after moving drawContours() from Imgproc to Core"
...
This reverts commit eb4ce67dac
.
Conflicts:
samples/android/color-blob-detection/src/org/opencv/samples/colorblobdetect/ColorBlobDetectionView.java
2012-10-15 17:53:57 +04:00
Vadim Pisarevsky
cb58e5a3a4
let Kalman handle the missing measurements (bug #1380 )
2012-10-12 14:01:36 +04:00
Andrey Kamaev
83799d6bf4
Fix Mat indexing in TrackingMotion tutorial code (supersedes pull request #38 )
2012-10-12 12:59:50 +04:00
Vsevolod Glumov
69fbc6102c
Fixed an issue with 'how_to_scan_images.cpp' tutorial code. Issue #2259
2012-10-11 03:51:34 +04:00
Alexander Smorkalov
a91de25f10
Build fix after issue #2284 fix.
2012-10-10 14:27:17 +04:00
Vadim Pisarevsky
044d38a051
expanded cv::threshold parallelization to other threading frameworks; fixed potential bug with unprocessed bottom of the image; fixed build problem in stitching
2012-10-09 22:38:04 +04:00
Vadim Pisarevsky
a09c88ab16
added Asus Xtion QVGA modes to the OpenNI backend (patch #1753 )
2012-10-09 22:01:43 +04:00
Vadim Pisarevsky
a310e2f027
fixed the case of scale != 1 in stereo_match.cpp (patch #1936 )
2012-10-08 22:39:11 +04:00
Abhinav Gupta
c0638aa2e0
Update samples/cpp/tutorial_code/features2D/SURF_detector.cpp
...
Changes made for OpenCV 2.4.2 compatibility
2012-10-05 21:31:41 +04:00
Andrey Pavlenko
a8e7f91e34
java samples fix (clear view before drawing frame) of 'dirty' FPS display bug
2012-09-28 18:21:22 +04:00
Vadim Pisarevsky
427ce1247a
some bugfixes & improvements in openfabmap code, docs and samples by Arren Glover
2012-09-23 20:57:34 +04:00
Alexander Mordvintsev
1017dea332
Merge branch 'master' of git://code.opencv.org/opencv
2012-09-17 19:37:38 +04:00
Alexander Mordvintsev
2a96f28bc1
get rid of Lock in gabor_threads.py
2012-09-17 19:30:20 +04:00
Andrey Kamaev
e73089bdb5
Fix windows build warnings
2012-09-17 13:30:28 +04:00
yao
04e946b2a3
make ocl surf sample compile on Linux
2012-09-13 17:34:06 +08:00
yao
c09e2f88df
Add a SURF sample for ocl module
2012-09-12 11:49:37 +08:00
Andrey Kamaev
36f912261b
Move gpu sample to gpu folder
2012-09-10 19:17:50 +04:00
Vladislav Vinogradov
98c92f196e
added Generalized Hough implementation
2012-09-10 16:49:40 +04:00
Andrey Kamaev
e564a53ccd
Add gitignore for Android tests and samples
2012-09-10 15:48:57 +04:00
Vadim Pisarevsky
53fdae93bd
fixed compile error on Windows
2012-09-07 15:25:32 +04:00
AoD314
54a202b3d5
add new version of CommandLineParser. add empty docs
2012-09-07 13:24:48 +04:00
Andrey Kamaev
07d92d9e5a
Fix android build warnings
2012-09-04 17:44:23 +04:00
Kevin
93155c6ae0
Overloaded PCA constructor and ( ) operator to implement Feature#2287 - PCA that retains a specified amount of variance from the data. A sample was added to samples/cpp to demonstrate the new functionality. Docs and Tests were also updated
2012-09-04 13:58:59 +04:00
Vadim Pisarevsky
67ff95083d
added openfabmap code, contributed by Arren Glover. fixed several warnings in the new versions of retina filters
2012-09-03 17:03:31 +04:00
kir
44da71daf4
removed duplicated sample (for facedetect)
2012-08-31 18:38:42 +04:00
Andrey Kamaev
067744d071
Fix Android samples for devices having front camera only (Nexus 7)
2012-08-31 18:25:08 +04:00
Andrey Kamaev
fc93518449
Fix package name of Android color blob detection sample
2012-08-31 17:47:12 +04:00
Andrey Kamaev
bd12f636c8
Unify manifest files in Android examples
2012-08-31 17:47:12 +04:00
Yury Zemlyanskiy
1fde184192
Small fixes for SimpleFlow algorithm
...
+ Fixed warnings
+ Add new function calcOpticalFlow with smaller number of arguments
+ Add asserts to algorithm and remove 'exit(1)'
2012-08-31 14:39:59 +04:00
Yury Zemlyanskiy
784c09d6f9
Updates for SimpleFlow algorithm
...
+ New format for flow data - CV_32C2
+ Memory optimization
+ Cross Bilateral Filter optimization
+ Minor optimizations
+ Sample for calcOpticalFlowSF improved
2012-08-31 14:39:59 +04:00
Yury Zemlyanskiy
c77d099018
"SimpleFlow" optical flow estimation algorithm (GSoC project) declaration in includes, implementation, usage example, test
2012-08-31 14:39:58 +04:00
niko
6f6e990988
use mutex provided by opencv itself
...
add getoclcontext and getoclcommandqueue so that other opencl program can interactive with opencv ocl module
correct haar test cases
add face detection sample
2012-08-31 14:08:52 +08:00
Andrey Kamaev
cd59cf3ab5
Fixed java camera release in Android tutorial-0 sample
2012-08-28 20:37:06 +04:00
Andrey Kamaev
47b9640785
Updated package version in Android samples
2012-08-28 15:07:42 +04:00
Andrey Kamaev
ba862ffdff
Fix/workaround bogus error in Android samples running on Android 4.1.1
2012-08-24 16:24:53 +04:00
Andrey Kamaev
e9e0668549
Fix crash on resume in face detection sample
2012-08-24 16:24:53 +04:00
Andrey Kamaev
285af48040
Fix Andoid samples: black screen after resume problem
2012-08-24 16:17:42 +04:00
Alexander Mordvintesv
4fb15ae1f0
Merge branch 'master' of code.opencv.org:opencv
2012-08-22 16:43:48 +03:00
Alexander Mordvintesv
d9185ec21b
added _doc.py -- doc-string ckecking utility
...
added some sample description
2012-08-22 16:42:19 +03:00
Vadim Pisarevsky
bbf679267a
modified facedetect to properly display very oblong objects and optionally flip image horizontally (for profile face detection). Added LBP cascades by Attila Novak for profile face detection and silverware detection (those are results of GSoC 2012)
2012-08-22 15:48:57 +04:00
Andrey Kamaev
f2a02feffa
Fix Windows build issues
...
* No /arch:SSE3 in MSVC
* Warnings fixed or suppressed
2012-08-22 11:21:09 +04:00
Alexander Mordvintesv
c9f2ff4487
added texture_flow.py sample
2012-08-19 20:36:50 +03:00
Alexander Mordvintesv
4c15465fbb
Merge branch 'master' of code.opencv.org:opencv
2012-08-18 19:43:46 +03:00
Alexander Mordvintesv
a4bffd96c4
added deconvolution.py sample and example images
2012-08-18 19:43:32 +03:00
Alexander Smorkalov
a1d8091e10
ColorBlobDetection Sample, ImageManpulations Sample and Tutorial2 updated. Issues with native camera on Nexus 7 (Android 4.1) fixed.
2012-08-16 16:52:53 +04:00
bitwangyaoyao
a091f9e4e2
bug fix of "squares" sample for ocl module
2012-08-16 20:34:24 +08:00
yao
d363d5589c
add an "squares" sample for ocl module
2012-08-16 16:01:40 +08:00
Alexey Spizhevoy
7992203598
Fixed CMakeLists.txt
2012-08-13 14:44:41 +04:00
Alexey Spizhevoy
27eb5d07cf
Added getScale/setScale for image warpers (stitching module)
2012-08-13 14:39:47 +04: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
Vladislav Vinogradov
79ef454c5f
Merge branch 'bgfg-gmg-optimized' into bgfg-gmg-merged
2012-08-09 14:55:36 +04:00
Vladislav Vinogradov
beb3e6ff18
added GMG_GPU to bgfg_segm sample
2012-08-09 12:59:18 +04:00
Vladislav Vinogradov
42c1d4f4b1
new optimized version of BackgroundSubtractorGMG
2012-08-08 18:15:06 +04:00
Vladislav Vinogradov
c5e92c31ba
fixed Bug #2252
...
error in the tutorial Similarity check (PNSR and SSIM) on the GPU
2012-08-08 14:38:14 +04:00
yao
2fed1fcbff
add an ocl sample
2012-08-08 17:12:53 +08: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
alexey.spizhevoy
a39bce204d
implemented DP-based seam estimation method
2012-08-07 16:24:21 +04: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
Philipp Wagner
1454f3d391
Added the facerec_demo.py to show how to perform Face Recognition with the Python module.
2012-07-30 01:16:38 +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
marina.kolpakova
cf92e4b4e0
Merge branch 'master' of git://5.9.49.245/opencv
2012-07-25 08:33:51 +04:00
marina.kolpakova
51f7a3ca81
fixed #2190
2012-07-25 08:32:14 +04:00
Andrey Pavlenko
794b07ba11
removing unused files
2012-07-24 23:58:52 +04:00
Andrey Pavlenko
e16ae33a17
removing unused file
2012-07-24 23:55:14 +04: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
Andrey Pavlenko
dc68a56bab
fixing wording
2012-07-15 05:51:29 +00:00
Andrey Pavlenko
92e6aa5f17
customizing the 'Google Market error' message in samples
2012-07-14 19:49:00 +00:00
Andrey Pavlenko
4e4db94b6b
removing warnings on deprecated api when targeting to android-15+
2012-07-14 19:07:27 +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
Andrey Pavlenko
5ec9909b71
updating include dirs to make CDT project in Eclipse happy
2012-07-11 13:12:37 +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
Andrey Kamaev
620d122fc2
Contrib module is added to java wrappers; fixed algorithm initialisation for python bindings
2012-07-05 07:58:40 +00:00
Andrey Kamaev
51f6127e0a
Merged the recent fixes from 2.4 branch
2012-07-04 08:04:31 +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
Andrey Pavlenko
e2e6838da3
adding CDT Builder (via ndk-build.cmd) for JNI part
2012-07-02 13:15:16 +00:00
Alexander Smorkalov
3a88fc5aa9
Android samples renaming was done. Icon updated.
2012-07-02 10:06:08 +00:00
Maria Dimashova
b3f68d29e7
fixed bow sample
2012-07-02 09:21:55 +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
Vadim Pisarevsky
e4b58ebff5
added GMG background segmentation algorithm by Andrew Godbehere, ticket #2065
2012-06-28 16:24:48 +00:00
Leonid Beynenson
00b02f9f6d
Small addition change in the FileStorage sample.
2012-06-28 11:17:32 +00:00
Leonid Beynenson
7fc18fe146
Added to the sample, demonstrating FileStorage, how to read/write data from/to std::string.
2012-06-28 10:32:34 +00:00
Andrey Pavlenko
42d830ec23
switching to dynamic linking
2012-06-28 07:51:19 +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
Andrey Kamaev
a323da6fd5
Fixed some warnings and install problems on linux
2012-06-27 12:02:31 +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
Andrey Pavlenko
3804ca3e20
changing package layout after 'make install' for Android build
2012-06-27 06:22:26 +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
Andrey Pavlenko
9efc1a689b
fixing project properties
2012-06-26 15:25:00 +00:00
Alexander Smorkalov
b962bf75cf
Sample3-native build fix. Dependency from OpenCV library project added. Scripts updated.
2012-06-26 13:24:12 +00:00
Alexander Smorkalov
369f2c4903
Color blob detection example updated for OpenCV Manager model.
2012-06-26 12:58:46 +00:00
Alexander Smorkalov
109e308763
Sample4-mixed was updated for OpenCV Manager model.
2012-06-26 12:57:43 +00:00
Alexander Smorkalov
0693073b98
Example3-native updated for OpenCV Manager model
2012-06-26 12:44:57 +00:00
Alexander Smorkalov
521b89e69d
Sample 2 was updated for OpenCV Manager model.
2012-06-26 12:31:04 +00:00
Alexander Smorkalov
207f4fc53c
Sample 1 updated for OpenCV Manager model.
2012-06-26 12:26:42 +00:00
Alexander Smorkalov
7a858885e6
Image manipulations sample updated for OpenCV Manager model.
2012-06-26 12:20:35 +00:00
Vladislav Vinogradov
e9e66e5796
added VIBE_GPU (background subtraction) to gpu module
2012-06-26 10:38:15 +00:00
Andrey Kamaev
ecf6b5a87c
Making all dependencies from highgui module optional
2012-06-26 07:29:36 +00:00
Alexander Smorkalov
700b685575
Revision 8725 restored. Android sample FaceDetection updated according DetectionBasedTracker interface.
2012-06-25 17:12:19 +00:00
Alexander Smorkalov
80febef237
revision 8721 vas merged to head. Detection based tracker interface changed. cpp and android samples updated.
2012-06-25 17:01:55 +00:00
Vladislav Vinogradov
d85ef03a42
added background subtraction sample for gpu module
2012-06-25 12:48:54 +00:00
Vladislav Vinogradov
3a4353f04d
added FGDStatModel, MOG and MOG2 to gpu performance sample
2012-06-25 11:46:45 +00:00
Vladislav Vinogradov
ed8b6c798b
copy 768x576.avi video to sample directory
2012-06-25 11:26:07 +00:00
Andrey Kamaev
ec3a7665b0
Fixed FREAK on Android
2012-06-25 11:19:11 +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
Andrey Kamaev
bd901eb52d
Reverted r8721 and r8725 (issue #2080 )
2012-06-24 08:50:03 +00:00
Vadim Pisarevsky
74707ec7ae
added FREAK (by Kirell Benzi, Raphael Ortiz, Alexandre Alahi and Pierre Vandergheynst)
2012-06-24 01:37:55 +00:00
Alexander Smorkalov
02170a0a58
Sample updated due to new DetectionBasedTracker interface.
2012-06-22 14:07:54 +00:00
Andrey Pavlenko
2984fa751e
adding OpenCV Manager
2012-06-21 14:50:05 +00:00
Alexander Smorkalov
a3be73b5cc
revisions 8681 and 8688 restored. Warning fixed.
...
Warning: changes beak binary compatibility
2012-06-21 14:37:28 +00:00
Andrey Pavlenko
0a58d8f139
moving to OpenCVLoader API
2012-06-21 14:06:23 +00:00
Andrey Kamaev
e94e5866a1
Fixed mingw build warnings
2012-06-20 17:57:26 +00:00
Andrey Kamaev
988c405f79
Fixed build with MSVC
2012-06-20 16:03:03 +00:00
Andrey Kamaev
d48d7b2b46
Updated warning options for GCC; fixed new warnings.
2012-06-20 12:27:02 +00:00
Andrey Kamaev
e8d158a5c8
Reverted changes breaking Android build
2012-06-19 08:10:05 +00:00
Alexander Mordvintsev
e0df3e27ac
added digits2.py sample (work in progress)
2012-06-18 14:42:43 +00:00