3399 Commits

Author	SHA1	Message	Date
alessandro faria	df5ec54fb8	Repair: incorrect display of class name	2017-12-04 22:00:54 +03:00
Alexander Alekhin	a3ec2ac3c5	Merge pull request #10176 from sturkmen72:update_train_hog	2017-12-04 16:24:42 +00:00
Suleyman TURKMEN	2aa380752c	Update train_HOG.cpp	2017-12-03 23:47:54 +03:00
Dmitry Kurtaev	03850008b9	Extra paddings for face detector layers	2017-12-03 17:04:53 +03:00
Alexander Alekhin	91c1d7697f	Merge pull request #10156 from dkurt:refresh_torch_enet_sample	2017-11-27 09:24:50 +00:00
Wei Hao	f2b3e5f517	Update houghlines.py ... Fix a code indent bug: cv2.imshow("detected lines", cdst)	2017-11-27 14:36:51 +08:00
Alexander Alekhin	807f5e33ad	Merge pull request #10055 from mabdullahrafique:patch-1	2017-11-26 12:00:16 +00:00
Dmitry Kurtaev	2af6f68452	Update Torch ENet sample	2017-11-24 21:20:18 +03:00
Dmitry Kurtaev	cdbbccbef8	Specific version of MobileNet-SSD from TensorFlow	2017-11-24 13:40:35 +03:00
Muhammad Abdullah	c180047bc1	update digits_video.py ... Following were the errors in the digits_video.py 1 ) The code was not working because data type of x was float however in "cv2.rectangle" we require integer . 2 ) After pressing the "esc" button the image windows did not destroy So I amended following things: 1 ) ~converted data type of x to int.~ Used Python integer division (//) 2 ) used cv2.destroyAllWindows() to close all windows after the press of "esc" by user.	2017-11-23 19:20:37 +00:00
Arthur Pastel	2feb0c2f61	Merge pull request #9895 from art049:parrallel_calibration_py ... * Adding threading in calibrate.py * samples: update calibrate.py	2017-11-23 21:27:11 +03:00
Alexander Alekhin	0f34628af7	dnn: drop OpenCL code path for DetectionOutputLayer ... getUMat()/getMat() calls are scope based. Results of these calls can't be stored somewhere for future usage.	2017-11-21 17:28:42 +03:00
Alexander Alekhin	3c6983a2bd	Merge pull request #10008 from Smorodov:master	2017-11-17 05:41:18 +00:00
Suleyman TURKMEN	63fb79b519	updates documentation and samples	2017-11-07 19:21:21 +03:00
Andrey Smorodov	c964aa3333	Matrices in colorizeSegmentation were not initialized.	2017-11-02 15:47:45 +03:00
Vadim Pisarevsky	639b800787	Merge pull request #9941 from catree:improve_dnn_samples	2017-10-30 09:58:18 +00:00
Vadim Pisarevsky	ff037ebe5f	Merge pull request #9845 from dkurt:fast_neural_style_models	2017-10-27 13:59:02 +00:00
catree	b4813e6bdf	Add C++ DNN face detection sample: resnet_ssd_face.cpp	2017-10-27 13:30:01 +02:00
Dmitry Kurtaev	4b52b8df34	Layers for fast-neural-style models: https://github.com/jcjohnson/fast-neural-style	2017-10-27 14:26:45 +03:00
catree	48e07437f0	Add camera/video/image input for C++ DNN object detection samples. Add nice display and computation time.	2017-10-27 11:57:06 +02:00
Dmitry Kurtaev	410d44d67d	Binary data for batch normalization test from Torch	2017-10-20 12:01:42 +03:00
catree	22dece8146	Fix DNN samples for compatibility with Python 3. ... Add PyInt_Check in pyopencv_dnn.hpp.	2017-10-15 20:24:56 +02:00
Vadim Pisarevsky	e955bcb872	Merge pull request #9824 from sturkmen72:upd_minEnclosingTriangle	2017-10-11 17:11:15 +00:00
Suleyman TURKMEN	af9c8377eb	Update minarea.cpp	2017-10-11 17:52:23 +03:00
Vadim Pisarevsky	5e82c98a9f	Merge pull request #9828 from berak:fix_c++17_9572	2017-10-11 13:31:18 +00:00
berak	ada753a54c	fix c++17 namsespace issues	2017-10-11 09:50:22 +02:00
Suleyman TURKMEN	b2673a19cf	Updates min_enclosing_triangle.cpp	2017-10-10 23:23:36 +03:00
Vadim Pisarevsky	b7ff9ddcdd	Merge pull request #9705 from AlexeyAB:dnn_darknet_yolo_v2	2017-10-10 12:02:03 +00:00
Vadim Pisarevsky	0739f28e56	Merge pull request #9786 from LaurentBerger:Histo3d	2017-10-10 10:58:34 +00:00
AlexeyAB	ecc34dc521	Added DNN Darknet Yolo v2 for object detection	2017-10-09 21:08:44 +03:00
LaurentBerger	0a19b07055	Use @snippet	2017-10-09 10:59:30 +02:00
Dmitry Kurtaev	e4aa39f9e5	Text TensorFlow graphs parsing. MobileNet-SSD for 90 classes.	2017-10-08 22:25:29 +03:00
Alexander Alekhin	9661d60f74	dnn(samples): fix python syntax (false -> False)	2017-10-08 19:17:40 +03:00
lzx1413	8a05c195f7	in python, false should be False	2017-10-08 21:10:25 +08:00
LaurentBerger	421c5dee12	3D histogram	2017-10-06 18:10:38 +02:00
Vadim Pisarevsky	d25ee8a273	Merge pull request #9761 from Jazmann:ellipseFitAMS&Direct	2017-10-06 14:35:42 +00:00
Vadim Pisarevsky	6c6900a6cd	Merge pull request #9424 from Cartucho:update_imgproc_tutorials	2017-10-06 14:02:58 +00:00
Dmitry Kurtaev	e268606e26	Grayscale colorization model (https://github.com/richzhang/colorization) test.	2017-10-06 09:33:41 +03:00
tribta	9a2317e063	Tutorial Hough Lines	2017-10-05 14:17:38 +03:00
tribta	d99ced6ec8	Tutorial Hough Circles	2017-10-05 14:17:38 +03:00
tribta	9ff33dacfc	Tutorial Make Border	2017-10-05 14:17:38 +03:00
tribta	a6f5e1f0ca	Tutorial Filter2D	2017-10-05 14:17:38 +03:00
tribta	08515281b9	Tutorial Image Pyramids	2017-10-05 14:17:38 +03:00
tribta	f7d85bfed8	Tutorial Sobel Derivatives	2017-10-05 14:17:36 +03:00
tribta	3250f11f0c	Tutorial Laplace Operator	2017-10-05 14:14:04 +03:00
tribta	d068e27420	Tutorial Morph Lines Detection	2017-10-05 14:14:04 +03:00
tribta	18bc4db75c	Tutorial Hit-or-Miss	2017-10-05 14:14:04 +03:00
tribta	bc18fb481f	Tutorial Smoothing Images	2017-10-05 14:14:03 +03:00
Jasper Shemilt	800da724a3	Fix Transposed eigenvals and vecs. Didn't notice at first	2017-10-02 17:56:08 +01:00
Jasper Shemilt	0136711cf4	Adds fitEllipseAMS to imgproc: The Approximate Mean Square (AMS) proposed by Taubin 1991. ... Adds fitEllipseDirect to imgproc: The Direct least square (Direct) method by Fitzgibbon1999. New Tests are included for the methods. fitEllipseAMS Tests fitEllipseDirect Tests Comparative examples are added to fitEllipse.cpp in Samples.	2017-10-02 16:38:41 +01:00
Deric Crago	a0d7cf89f2	Fixed 'boundary' spelling	2017-09-26 23:42:48 -04:00
Alexander Alekhin	aea25e7f90	Merge pull request #9676 from jrobble:fix_caffe_swaprb	2017-09-25 16:05:11 +00:00
vipinanand4	39e742765a	Merge pull request #9618 from vipinanand4:goodFeaturesToTrack_added_gradiantSize ... Added gradiantSize param into goodFeaturesToTrack API (#9618) * Added gradiantSize param into goodFeaturesToTrack API Removed hardcode value 3 in goodFeaturesToTrack API, and added new param 'gradinatSize' in this API so that user can pass any gradiant size as 3, 5 or 7. Signed-off-by: Vipin Anand <anand.vipin@gmail.com> Signed-off-by: Nilaykumar Patel<nilay.nilpat@gmail.com> Signed-off-by: Prashanth Voora <prashanthx85@gmail.com> * fixed compilation error for java test Signed-off-by: Vipin Anand <anand.vipin@gmail.com> * Modifying code for previous binary compatibility and fixing other warnings fixed ABI break issue resolved merged conflict compilation error fix Signed-off-by: Vipin Anand <anand.vipin@gmail.com> Signed-off-by: Patel, Nilaykumar K <nilay.nilpat@gmail.com>	2017-09-22 14:04:43 +00:00
Suleyman TURKMEN	50aa4f8887	Merge pull request #9686 from sturkmen72:patch-1 ... Update planar_tracking.cpp (#9686)	2017-09-22 14:02:12 +00:00
jrobble	c67ad49378	Set swapRB to false in Caffe tests and examples.	2017-09-22 09:58:48 -04:00
Vadim Pisarevsky	63584bc4d0	Merge pull request #9444 from hrnr:akaze_tutorial	2017-09-18 10:27:07 +00:00
Dmitry Kurtaev	bd8e6b7e14	Make external cv::dnn::Importer usage is deprecated	2017-09-18 08:52:36 +03:00
Vadim Pisarevsky	4196543cd5	Merge pull request #9313 from dkurt:dnn_perf_test	2017-09-16 19:39:23 +00:00
Alexander Alekhin	9dea296241	Merge pull request #9458 from csukuangfj:fix-doc	2017-09-15 19:35:01 +00:00
Alexander Alekhin	2566ef3515	Merge pull request #9526 from sturkmen72:update_documentation	2017-09-15 18:47:06 +00:00
Suleyman TURKMEN	d547c6b1a2	documentation improvement	2017-09-13 17:24:59 +03:00
Vadim Pisarevsky	bc09d1ba3b	Merge pull request #9406 from Cartucho:update_core_tutorials	2017-09-13 14:09:39 +00:00
Vadim Pisarevsky	da257f3397	Merge pull request #9541 from sturkmen72:patch-15	2017-09-13 13:47:27 +00:00
Suleyman TURKMEN	f6daaccccf	Update train_HOG.cpp	2017-09-12 20:07:37 +03:00
tribta	45afd29b72	Tutorial Mask Operations on Matrices	2017-09-09 15:20:21 +01:00
tribta	954e2f9b9c	Tutorial Discrete Fourier Transform	2017-09-09 15:10:18 +01:00
tribta	13317bdfda	Tutorial Basic Geometric Drawing	2017-09-09 15:02:51 +01:00
tribta	c4c1e94088	Tutorial Adding Images	2017-09-09 15:02:51 +01:00
Alexander Alekhin	e1b102e9a6	Merge pull request #9476 from dkurt:tutorial_dnn_android	2017-09-03 10:34:25 +00:00
Dmitry Kurtaev	72001dc13c	Android sample for DNN module	2017-09-03 12:58:10 +03:00
Alexander Alekhin	d0f902053f	Merge pull request #9510 from sturkmen72:update_samples	2017-08-31 15:57:45 +00:00
Alexander Alekhin	f6265500fb	Merge pull request #9516 from arrybn:ssd_face_detector	2017-08-31 11:43:04 +00:00
Aleksandr Rybnikov	d991054202	Added files for face detector sample	2017-08-31 13:46:17 +03:00
Suleyman TURKMEN	efa0e75eac	Update stitching.cpp	2017-08-30 15:09:33 +03:00
Alexander Alekhin	e1ab227b6d	Merge pull request #9515 from berak:fix_directx_samples	2017-08-30 10:33:17 +00:00
berak	a0e26817e2	fix missing std:: in d3dsample	2017-08-30 11:00:18 +02:00
KUANG Fangjun	11fa0094ff	Improve the documentation. ... Add demo code for cv::reduce, cv::merge and cv::split.	2017-08-28 12:36:23 +02:00
Dmitry Kurtaev	5c43a394c5	Added performance test for Caffe framework	2017-08-27 19:40:58 +03:00
Adi Shavit	8a094a5f54	Merge pull request #9445 from adishavit:master ... * Adds cv::resizeWindow() overload taking a single cv::Size argument. * Replaces copied documentaion with Doxygen @overload command.	2017-08-25 11:37:50 +00:00
Alexander Alekhin	717b2f496f	Merge pull request #9139 from Cartucho:improve_match_template_py ... GSoC - Improving code match_template.py	2017-08-24 19:51:09 +00:00
Alexander Alekhin	a2f7132648	Merge pull request #9460 from Cartucho:pylint_samples_py	2017-08-24 19:46:54 +00:00
tribta	7555ab194f	Samples Python: ... * Unused variables * Bad identation	2017-08-24 17:45:14 +01:00
Alexander Alekhin	25a4559565	Merge pull request #9294 from arrybn:layers_perf	2017-08-24 09:37:49 +00:00
Aleksandr Rybnikov	8b1146deb2	Added function to get timings for layers	2017-08-23 13:40:05 +03:00
Jiri Horner	f6deaf5f2a	tracking tutorial: add fps to stats	2017-08-23 10:40:17 +02:00
Dmitry Kurtaev	1e3052d3cd	Update MobileNet object detection sample	2017-08-23 09:29:01 +03:00
Alexander Alekhin	b67c64e2c8	Merge pull request #9439 from eruffaldi:macos_build_opengl_qt5_interop2	2017-08-23 04:13:50 +00:00
Emanuele Ruffaldi	301ab43897	apple exclusion	2017-08-22 23:32:01 +02:00
Alexander Alekhin	89172c08a2	Merge pull request #9049 from Cartucho:improve_mask_tutorial_codes	2017-08-21 07:14:46 +00:00
Alexander Alekhin	9e239c7a1e	highgui: refactor GTK backend ... - eliminate legacy C code, used fields - fix mutex synchronization issues - set trackbar min/max without unnecessary truncation; allow negative values	2017-08-14 19:33:00 +00:00
Alexander Alekhin	6b2510d312	Merge pull request #9317 from sturkmen72:warpPerspective_demo	2017-08-14 13:15:48 +00:00
Suleyman TURKMEN	8bb3863f52	New example - warpPerspective_demo.cpp ... An example program shows using cv::findHomography and cv::warpPerspective for image warping	2017-08-10 15:08:13 +03:00
Sergey Alexandrov	0f8faa3441	Minor update for example-gpu-super_resolution ... * Remove "simple" flow estimation from help (because it was disabled by 653bca8b) * Add `flush` after printing iteration number for better UX	2017-08-07 21:39:51 +02:00
Alexander Alekhin	c95a97389d	Merge pull request #9235 from sturkmen72:patch-3	2017-08-03 17:04:28 +00:00
Ryan Pavlik	5d699e9ba5	Honor fixing principal point in camera calib tutorial.	2017-08-01 10:35:18 -05:00
Alexander Alekhin	2959e7aba9	Merge pull request #9188 from arrybn:mobilenet_ssd_sample	2017-08-01 11:12:54 +00:00
Aleksandr Rybnikov	ce1cc352d9	MobileNet SSD sample	2017-08-01 12:30:27 +03:00
Alexander Alekhin	bdb6b45c91	Merge pull request #9259 from eyolfson:patch-1	2017-07-30 10:08:23 +00:00
Suleyman TURKMEN	89480801b8	some improvements on tutorials	2017-07-29 20:08:19 +03:00
Jon Eyolfson	27cf941284	Remove unused method declarations in hog.cpp ... The class `App` appears to have two unused methods: `message` and `checkRectSimilarity`. The is no definition or use of either of these methods. This appears to be dead code.	2017-07-28 10:19:35 -04:00
Martin Ganeff	3ea889050b	Removed _gpu-suffix from usage messages to align with executable name	2017-07-28 10:20:59 +02:00
Alexander Alekhin	602f047fe8	build: replace WIN32 => _WIN32	2017-07-25 13:30:48 +03:00
Aleksandr Rybnikov	7d1140340e	Rewrote googlenet tests	2017-07-18 18:49:14 +03:00
Vladislav Sovrasov	e5fbb4f5d2	Merge pull request #9034 from sovrasov:mats_from_initializer_list ... Add constructors taking initializer_list for some of OpenCV data types (#9034) * Add a constructor taking initializer_list for Matx * Add a constructor taking initializer list for Mat and Mat_ * Add one more method to initialize Mat to the corresponding tutorial * Add a note how to initialize Matx * CV_CXX_11->CV_CXX11	2017-07-14 17:17:09 +00:00
tribta	7c65f7ef11	Fixing Bad identations (line 18 to 96) ... Adding _ to the unused variables for clarity (line 77)	2017-07-11 11:59:22 +01:00
Alexander Alekhin	639e7367a7	Merge pull request #9081 from catree:fix_tutorial_pca_intro ... Fix wrong mat access in introduction_to_pca.cpp	2017-07-03 16:18:15 +00:00
Tony Lian	c8783f3e23	Merge pull request #9075 from TonyLianLong:master ... Remove unnecessary Non-ASCII characters from source code (#9075) * Remove unnecessary Non-ASCII characters from source code Remove unnecessary Non-ASCII characters and replace them with ASCII characters * Remove dashes in the @param statement Remove dashes and place single space in the @param statement to keep coding style * misc: more fixes for non-ASCII symbols * misc: fix non-ASCII symbol in CMake file	2017-07-03 16:14:17 +00:00
catree	8b7cb8a3f1	Fix wrong mat access.	2017-07-03 16:56:53 +02:00
tribta	d53a5210a8	Improving codes of the tutorial: mat_mask_oprations ... *Fixing typos; *Making codes more similar to the main one, in C++; *Adding Grayscale option to the Python and Java codes; *Fixing python identation, whitespaces and redundancies.	2017-06-30 12:38:24 +01:00
Vadim Pisarevsky	5f1b6ee889	Merge pull request #9017 from sovrasov:parallel_for_cxx11	2017-06-29 11:12:57 +00:00
Vadim Pisarevsky	27c7ef28a7	Merge pull request #9020 from arrybn:fix_googlenet_python_sample	2017-06-29 11:10:46 +00:00
Maksim Shabunin	ace0701a46	Merge pull request #9019 from alalek:dnn_trace	2017-06-29 07:33:46 +00:00
Vladislav Sovrasov	08db55fb62	core: add CV_CXX_11 flag to cvdef.h	2017-06-28 16:17:53 +03:00
Vladislav Sovrasov	3c748ccf10	core: add an ability to use cxx11 lambda as a parallel_for_ body	2017-06-28 16:16:05 +03:00
Alexander Alekhin	20f603a217	Merge pull request #8993 from Cartucho:compiling_java_code	2017-06-28 12:26:29 +00:00
Aleksandr Rybnikov	b8b8047448	Fixed python sample for googlenet in dnn	2017-06-28 15:07:56 +03:00
Alexander Alekhin	ed10383359	dnn: added trace macros	2017-06-28 14:57:26 +03:00
tribta	98849151a2	formating style and making changes accordingly to review	2017-06-28 11:05:18 +01:00
Alexander Alekhin	00dd433368	dnn: fix LayerFactory initialization	2017-06-27 23:19:53 +03:00
Cartucho	fd91072990	Merge branch 'master' into compiling_java_code	2017-06-27 02:32:11 +01:00
tribta	3611396c0b	Compiling the Java tutorials codes using Apache Ant.	2017-06-27 02:30:22 +01:00
Vadim Pisarevsky	48924cd874	Merge pull request #8989 from alalek:move_dnn_module	2017-06-26 21:57:26 +00:00
Alexander Alekhin	623de337e8	dnn: fix build warnings	2017-06-26 19:48:42 +03:00
Alexander Alekhin	006966e629	trace: initial support for code trace	2017-06-26 17:07:13 +03:00
Alexander Alekhin	382e38941c	dnn: fix documentation links	2017-06-26 15:10:50 +03:00
Alexander Alekhin	14de8ac951	dnn: move samples	2017-06-26 14:51:12 +03:00
Zhiwei Su	8bf3f6bfcb	Fixed gray window for gpu stereo BP and CSBP ... compute() for BP and CSBP output 32-bit floating-point mat, and in cv::imshow() 32-bit floating-point is recognized as [0,1] and maped to [0,255], that causes gray window for BP and CSBP.	2017-06-19 20:30:28 +08:00
Alexander Alekhin	1961bb1857	cmake: add ENABLE_BUILD_HARDENING option	2017-06-08 00:39:29 +00:00
Vadim Pisarevsky	9734ee13e5	Merge pull request #7865 from LaurentBerger:UserColormap	2017-05-24 12:43:55 +00:00
Alexander Alekhin	2186ec7665	Merge pull request #8754 from berak:fix_py_hog_svm_tut	2017-05-22 13:41:10 +00:00
berak	2af63c2bf1	fix py_svm_opencv sample	2017-05-21 07:39:05 +02:00
Cartucho	2055bcc807	Extending template_matching tutorial with Java (#8043) ... * Extending template_matching tutorial with Java * adding mask to java version of the tutorial * adding the python toggle and code * updating table of content * adding py and java to table of content * adding mask to python * going back to markdown with duplicated text * non duplicated text	2017-05-12 00:42:04 +03:00
berak	7b05d52f7b	py_samples: fix digits.py	2017-05-11 08:34:21 +02:00
Maksim Shabunin	ea49d7b7c5	Merge pull request #8653 from alalek:android_fixes	2017-05-03 12:20:19 +00:00
Louie Helm	39874d7254	Fix Farneback GPU Sample in GCC6	2017-04-27 16:28:36 -07:00
Alexander Alekhin	133b91a026	android: build fixes ... - eliminate CMake 3.5+ warnings - removed usage of dropped "OPENCV_CAMERA_MODULES" variable - partial support for Android NDK 11+	2017-04-26 14:24:51 +03:00
Vladislav Sovrasov	ad7cf58450	highgui: add ROI selector	2017-04-21 13:29:35 +03:00
berak	7ce6895a2c	Update tvl1_optical_flow.cpp ... repair broken cmdline param for cpu/gpu mode	2017-04-17 09:10:10 +02:00
Mark Szumowski	94d63d4281	Update research paper link in Python sample ... The docstring for one of the Python sample programs includes a link to the research paper describing the main algorithm. That link is no longer valid (results in a 404 error) so this update replaces it with another link from the same institution which is currently valid.	2017-04-01 10:58:07 +11:00
Alexander Alekhin	9d593e7779	Merge pull request #8324 from sturkmen72:update_objectDetection_cpp	2017-03-07 09:39:02 +00:00
Suleyman TURKMEN	50bda8adfe	Update objectDetection.cpp	2017-03-06 16:51:29 +03:00
Vadim Pisarevsky	8e8da3f5b0	Merge pull request #8282 from vskarlsruhe:patch-3	2017-03-02 11:18:26 +00:00
Vadim Pisarevsky	38abc61de5	Merge pull request #8289 from vskarlsruhe:patch-4	2017-03-02 05:52:05 +00:00
Alexander Alekhin	78784040aa	Merge pull request #8249 from vskarlsruhe:patch-1	2017-02-28 14:25:50 +00:00
umbraclet16	17ece5861a	Solve issue #8264 ... Fix bug in camera_calibration.cpp that the program tries to parse input of type VIDEO_FILE as IMAGE_LIST which causes the program to crash.	2017-02-28 13:31:24 +03:00
vskarlsruhe	6e12391c91	Code cleanup, removed cv:: because using namespace cv is already used.	2017-02-28 10:03:09 +01:00
vskarlsruhe	ed9c924102	Code easier to read now ... Increase readability by using namespace std	2017-02-27 11:29:00 +01:00
vskarlsruhe	56cedfc4d2	Update AddingImages.cpp ... If-condition was always true (alpha = 0.5 is set in Line 19). Now the user input is checked to be between 0 and 1. This is correct in the tutorial code for OpenCV 2.4.	2017-02-23 11:43:30 +01:00
LaurentBerger	8638bba670	Merge pull request #8220 from LaurentBerger:Issue5035	2017-02-19 13:15:58 +03:00
atinfinity	ca5e0f53b8	refactoring	2017-02-13 00:53:35 +09:00
atinfinity	bbe0f2cef5	refactoring	2017-02-13 00:35:52 +09:00
atinfinity	c2a880d7c9	fixed indent	2017-02-13 00:26:48 +09:00
atinfinity	9552206a4c	added option to specify flow type	2017-02-12 23:33:57 +09:00
atinfinity	18dbed0e0d	added dense flow sample	2017-02-05 22:10:37 +09:00
Maksim Shabunin	b417b4dbee	KMeans improvement ... - fixed returned compactness value - added centers drawing to the example app - added compactness test	2017-01-31 12:05:08 +03:00
LaurentBerger	48e2d38be7	Merge branch 'master' of git://github.com/Opencv/opencv into UserColormap	2017-01-28 11:25:11 +01:00
Alexander Alekhin	4b7c0b9c76	cuda: fix samples	2017-01-23 18:45:53 +03:00
catree	e357e2c1b7	Fix typos in py_houghlines tutorial. Extract the python code in a specific folder.	2017-01-17 16:09:27 +01:00
logic1988	a8e5d1d9fd	Merge pull request #7978 from logic1988:master ... Fix error usage in HitMiss tutorial, and improved the visualization results (#7978) * Fix error usage in HitMiss tutorial, and improved the visualization results Fix error usage in HitMiss tutorial, and improved the visualization results * Update HitMiss.cpp * Update HitMiss.cpp	2017-01-16 13:19:24 +03:00
Alexander Alekhin	97f5d05d1f	Merge pull request #7960 from catree:tutorial_parallel_for_ ... Add OpenCV parallel_for_ tutorial.	2017-01-11 12:58:53 +03:00
catree	e16e141c38	Add OpenCV parallel_for_ tutorial.	2017-01-10 17:39:46 +01:00
LaurentBerger	5e08d588f8	Merge branch 'master' of git://github.com/Opencv/opencv into UserColormap	2017-01-09 10:38:08 +01:00
catree	a891caa755	Use directly the doxygen snippet command for the Changing the contrast and brightness of an image tutorial. Extend the tutorial with a pratical example and with a gamma correction method to adjust the brightness of an image.	2017-01-05 18:31:03 +01:00
Lorena García	3650ec02be	HitMiss tutorial	2017-01-03 18:34:04 +01:00
LaurentBerger	a2f3692bff	Merge branch 'master' of git://github.com/Opencv/opencv into UserColormap	2016-12-26 17:03:52 +01:00
jacobdang	dd482c6a29	bug fix for #7846	2016-12-17 21:48:29 +08:00
Vadim Pisarevsky	75eeb25c1e	Merge pull request #7866 from alalek:update_waitKey	2016-12-16 12:25:11 +00:00
LaurentBerger	8415b907bb	warnings 2	2016-12-16 09:23:21 +01:00
LaurentBerger	f92c9ddb43	warning 2	2016-12-16 09:09:39 +01:00
LaurentBerger	1f724e2e8a	warnings	2016-12-16 08:33:31 +01:00
LaurentBerger	5ad02d7a9a	Add sample	2016-12-15 22:55:59 +01:00
StevenPuttemans	6d34d6b47e	update samples: waitKey() usage ... Original commit is a5f19f7dd6	2016-12-15 15:39:47 +03:00
Cartucho	fcddfa4f86	GSoC 2016 - Adding ALIASES for tutorial (#7041) ... * GSoC 2016 - Adding toggle files to be used by tutorials. Add a toggle option for tutorials. * adds a button on the HTML tutorial pages to switch between blocks * the default option is for languages: one can write a block for C++ and another one for Python without re-writing the tutorial Add aliases to the doxyfile. * adding alises to make a link to previous and next tutorial. * adding alias to specify the toggle options in the tutorials index. * adding alias to add a youtube video directly from link. Add a sample tutorial (mat_mask_opertaions) using the developed aliases: * youtube alias * previous and next tutorial alias * buttons * languages info for tutorial table of content * code referances with snippets (and associated sample code files) * Removing the automatic ordering. Adding specific toggles for cpp, java and python. Move all the code to the footer / header and Doxyfile. Updating documentation.	2016-12-15 15:32:12 +03:00
Vladislav Sovrasov	21683a550a	Update MSER python sample	2016-12-12 14:17:25 +03:00
mshabunin	695c518384	Updated TBB search script and code checks	2016-12-01 16:58:38 +03:00
Rostislav Vasilikhin	f89ea6d7fa	hide info warnings	2016-11-22 16:49:46 +03:00
Rostislav Vasilikhin	d7db220196	"no previous declaration" warnings fixed in samples	2016-11-22 16:49:46 +03:00
Andrey Pavlenko	289d879d48	build fixes for openvx-1.0.1 and c++03 ... * fixing 1.0.1 * fixing build without c++11	2016-11-22 16:49:46 +03:00
Rostislav Vasilikhin	2c63d2bd72	changed image creation from handle	2016-11-22 16:49:46 +03:00
Rostislav Vasilikhin	9032a7ab81	minor fixes in samples and ivx.hpp	2016-11-22 16:49:46 +03:00
Rostislav Vasilikhin	5c969d1972	interoperability OpenVX samples added	2016-11-22 16:49:46 +03:00
LaurentBerger	fb456eb69c	Merge pull request #7691 from LaurentBerger:I7676 ... * Solve issue 7676 * I7676 bis	2016-11-21 04:28:59 +03:00
Alexander Alekhin	876c2c0efd	Merge pull request #7678 from dec1:tag_3.0.0	2016-11-15 19:35:38 +00:00
Declan Moran	a49e50a33b	fix error when building android sample: ... https://github.com/opencv/opencv/issues/7590	2016-11-15 15:02:10 +01:00
Vadim Pisarevsky	050731c4d2	Merge pull request #7552 from es0m:master	2016-11-02 12:12:09 +00:00
Eric Sommerlade	752b10e410	fixed _MSC_VER check for at least vs2013 in dbt_face_detection sample	2016-10-31 13:48:41 +00:00
Eric Sommerlade	72e4e9d43d	fixed _MSC_VER check for vs2013 in dbt_face_detection sample	2016-10-31 13:46:22 +00:00
Eric Sommerlade	049a894986	fixed detection_based_tracker on visual studio 2013 and later ... modules/objectdetect/src/detection_based_tracker.cpp: made unique_lock<mutex> local to each function samples/cpp/dbt_face_detection.cpp: fixed warnings on loop in Visual Studio	2016-10-31 11:07:09 +00:00
StevenPuttemans	5728f796f6	updating python tutorials + providing necessary data	2016-10-26 13:14:20 +02:00
Jiri Horner	c17afe0fab	Merge pull request #6933 from hrnr:gsoc_all ... [GSOC] New camera model for stitching pipeline * implement estimateAffine2D estimates affine transformation using robust RANSAC method. * uses RANSAC framework in calib3d * includes accuracy test * uses SVD decomposition for solving 3 point equation * implement estimateAffinePartial2D estimates limited affine transformation * includes accuracy test * stitching: add affine matcher initial version of matcher that estimates affine transformation * stitching: added affine transform estimator initial version of estimator that simply chain transformations in homogeneous coordinates * calib3d: rename estimateAffine3D test test Calib3d_EstimateAffineTransform rename to Calib3d_EstimateAffine3D. This is more descriptive and prevents confusion with estimateAffine2D tests. * added perf test for estimateAffine functions tests both estimateAffine2D and estimateAffinePartial2D * calib3d: compare error in square in estimateAffine2D * incorporates fix from #6768 * rerun affine estimation on inliers * stitching: new API for parallel feature finding due to ABI breakage new functionality is added to `FeaturesFinder2`, `SurfFeaturesFinder2` and `OrbFeaturesFinder2` * stitching: add tests for parallel feature find API * perf test (about linear speed up) * accuracy test compares results with serial version * stitching: use dynamic_cast to overcome ABI issues adding parallel API to FeaturesFinder breaks ABI. This commit uses dynamic_cast and hardcodes thread-safe finders to avoid breaking ABI. This should be replaced by proper method similar to FeaturesMatcher on next ABI break. * use estimateAffinePartial2D in AffineBestOf2NearestMatcher * add constructor to AffineBestOf2NearestMatcher * allows to choose between full affine transform and partial affine transform. Other params are the as for BestOf2NearestMatcher * added protected field * samples: stitching_detailed support affine estimator and matcher * added new flags to choose matcher and estimator * stitching: rework affine matcher represent transformation in homogeneous coordinates affine matcher: remove duplicite code rework flow to get rid of duplicite code affine matcher: do not center points to (0, 0) it is not needed for affine model. it should not affect estimation in any way. affine matcher: remove unneeded cv namespacing * stitching: add stub bundle adjuster * adds stub bundle adjuster that does nothing * can be used in place of standard bundle adjusters to omit bundle adjusting step * samples: stitching detailed, support no budle adjust * uses new NoBundleAdjuster * added affine warper * uses R to get whole affine transformation and propagates rotation and translation to plane warper * add affine warper factory class * affine warper: compensate transformation * samples: stitching_detailed add support for affine warper * add Stitcher::create method this method follows similar constructor methods and returns smart pointer. This allows constructing Stitcher according to OpenCV guidelines. * supports multiple stitcher configurations (PANORAMA and SCANS) for convenient setup * returns cv::Ptr * stitcher: dynamicaly determine correct estimator we need to use affine estimator for affine matcher * preserves ABI (but add hints for ABI 4) * uses dynamic_cast hack to inject correct estimator * sample stitching: add support for multiple modes shows how to use different configurations of stitcher easily (panorama stitching and scans affine model) * stitcher: find features in parallel use new FeatureFinder API to find features in parallel. Parallelized using TBB. * stitching: disable parallel feature finding for OCL it does not bring much speedup to run features finder in parallel when OpenCL is enabled, because finder needs to wait for OCL device. Also, currently ORB is not thread-safe when OCL is enabled. * stitching: move matcher tests move matchers tests perf_stich.cpp -> perf_matchers.cpp * stitching: add affine stiching integration test test basic affine stitching (SCANS mode of stitcher) with images that have only translation between them * enable surf for stitching tests stitching.b12 test was failing with surf investigated the issue, surf is producing good result. Transformation is only slightly different from ORB, so that resulting pano does not exactly match ORB's result. That caused sanity check to fail. * added size checks similar to other tests * sanity check will be applied only for ORB * stitching: fix wrong estimator choice if case was exactly wrong, estimators were chosen wrong added logging for estimated transformation * enable surf for matchers stitching tests * enable SURF * rework sanity checking. Check estimated transform instead of matches. Est. transform should be more stable and comparable between SURF and ORB. * remove regression checking for VectorFeatures tests. It has a lot if data andtest is the same as previous except it test different vector size for performance, so sanity checking does not add any value here. Added basic sanity asserts instead. * stitching tests: allow relative error for transform * allows .01 relative error for estimated homography sanity check in stitching matchers tests * fix VS warning stitching tests: increase relative error increase relative error to make it pass on all platforms (results are still good). stitching test: allow bigger relative error transformation can differ in small values (with small absolute difference, but large relative difference). transformation output still looks usable for all platforms. This difference affects only mac and windows, linux passes fine with small difference. * stitching: add tests for affine matcher uses s1, s2 images. added also new sanity data. * stitching tests: use different data for matchers tests this data should yeild more stable transformation (it has much more matches, especially for surf). Sanity data regenerated. * stitching test: rework tests for matchers * separated rotation and translations as they are different by scale. * use appropriate absolute error for them separately. (relative error does not work for values near zero.) * stitching: fix affine warper compensation calculation of rotation and translation extracted for plane warper was wrong * stitching test: enable surf for opencl integration tests * enable SURF with correct guard (HAVE_OPENCV_XFEATURES2D) * add OPENCL guard and correct namespace as usual for opencl tests * stitching: add ocl accuracy test for affine warper test consistent results with ocl on and off * stitching: add affine warper ocl perf test add affine warper to existing warper perf tests. Added new sanity data. * stitching: do not overwrite inliers in affine matcher * estimation is run second time on inliers only, inliers produces in second run will not be therefore correct for all matches * calib3d: add Levenberg–Marquardt refining to estimateAffine2D* functions this adds affine Levenberg–Marquardt refining to estimateAffine2D functions similar to what is done in findHomography. implements Levenberg–Marquardt refinig for both full affine and partial affine transformations. * stitching: remove reestimation step in affine matcher reestimation step is not needed. estimateAffine2D* functions are running their own reestimation on inliers using the Levenberg-Marquardt algorithm, which is better than simply rerunning RANSAC on inliers. * implement partial affine bundle adjuster bundle adjuster that expect affine transform with 4DOF. Refines parameters for all cameras together. stitching: fix bug in BundleAdjusterAffinePartial * use the invers properly * use static buffer for invers to speed it up * samples: add affine bundle adjuster option to stitching_detailed * add support for using affine bundle adjuster with 4DOF * improve logging of initial intristics * sttiching: add affine bundle adjuster test * fix build warnings * stitching: increase limit on sanity check prevents spurious test failures on mac. values are still pretty fine. * stitching: set affine bundle adjuster for SCANS mode * fix bug with AffineBestOf2NearestMatcher (we want to select affine partial mode) * select right bundle adjuster * stitching: increase error bound for matcher tests * this prevents failure on mac. tranformation is still ok. * stitching: implement affine bundle adjuster * implements affine bundle adjuster that is using full affine transform * existing test case modified to test both affinePartial an full affine bundle adjuster * add stitching tutorial * show basic usage of stitching api (Stitcher class) * stitching: add more integration test for affine stitching * added new datasets to existing testcase * removed unused include * calib3d: move `haveCollinearPoints` to common header * added comment to make that this also checks too close points * calib3d: redone checkSubset for estimateAffine* callback * use common function to check collinearity * this also ensures that point will not be too close to each other * calib3d: change estimateAffine* functions API * more similar to `findHomography`, `findFundamentalMat`, `findEssentialMat` and similar * follows standard recommended semantic INPUTS, OUTPUTS, FLAGS * allows to disable refining * supported LMEDS robust method (tests yet to come) along with RANSAC * extended docs with some tips * calib3d: rewrite estimateAffine2D test * rewrite in googletest style * parametrize to test both robust methods (RANSAC and LMEDS) * get rid of boilerplate * calib3d: rework estimateAffinePartial2D test * rework in googletest style * add testing for LMEDS * calib3d: rework estimateAffine*2D perf test * test for LMEDS speed * test with/without Levenberg-Marquart * remove sanity checking (this is covered by accuracy tests) * calib3d: improve estimateAffine*2D tests * test transformations in loop * improves test by testing more potential transformations * calib3d: rewrite kernels for estimateAffine*2D functions * use analytical solution instead of SVD * this version is faster especially for smaller amount of points * calib3d: tune up perf of estimateAffine*2D functions * avoid copying inliers * avoid converting input points if not necessary * check only `from` point for collinearity, as `to` does not affect stability of transform * tutorials: add commands examples to stitching tutorials * add some examples how to run stitcher sample code * mention stitching_detailed.cpp * calib3d: change computeError for estimateAffine*2D * do error computing in floats instead of doubles this have required precision + we were storing the result in float anyway. This make code faster and allows auto-vectorization by smart compilers. * documentation: mention estimateAffine*2D function * refer to new functions on appropriate places * prefer estimateAffine*2D over estimateRigidTransform * stitching: add camera models documentations * mention camera models in module documentation to give user a better overview and reduce confusion	2016-10-22 19:10:42 +03:00
Alexander Alekhin	c31f89f0de	viz: eliminate warnings from tutorial code	2016-10-21 18:33:40 +03:00
Alexander Alekhin	5da8d65371	eliminate compiler warnings	2016-10-08 02:19:43 +03:00
danil-tolkachev	50d02b9f84	supress numpy future warning with None comparison	2016-09-14 21:39:11 +03:00
Maksim Shabunin	4e918fb987	Merge pull request #7165 from PkLab:doc_videoio	2016-09-09 18:01:41 +00:00
PkLab.net	be65701908	Large update of videoio doc and samples following mshabunin comments	2016-09-09 18:46:11 +02:00
catree	aaa335b617	Add the possibility to use a video stream with the peopledetect.cpp sample. ... Fixed video input argument.	2016-09-04 19:50:36 +02:00
Maksim Shabunin	a278abdc76	Merge pull request #7140 from Asalle:fix-7136-Bounding_Box_explanation	2016-08-29 08:42:02 +00:00
Asal Mirzaieva	ec5ae4af1d	add explanation to the Bounding Box and Circles tutorial ... - also some minor changes to the respective sample cpp file	2016-08-26 18:23:32 +03:00
Vadim Pisarevsky	e00e8ebea9	Merge pull request #7149 from Cartucho:patch-1	2016-08-26 11:39:51 +00:00
Vadim Pisarevsky	4c75872e0f	Merge pull request #6937 from catree:add_peopledetect_sample	2016-08-22 12:48:41 +00:00
Cartucho	d482b5c102	Update hull_demo.cpp ... The Mat "src_copy" is never used.	2016-08-22 13:45:24 +02:00
Vadim Pisarevsky	2f069c108f	Merge pull request #6945 from sturkmen72:update_documentation	2016-08-18 13:23:17 +00:00
Alexander Alekhin	89833fa073	Merge pull request #7095 from PkLab:fix_rho&phi_doc	2016-08-17 10:46:30 +00:00
PkLab.net	4b099e8ade	Fix rho,phi exchange and amend linearPolar & logPolar docs with details and pics.	2016-08-16 12:49:33 +02:00
LaurentBerger	42b763e6b7	Canny with own gradient (#6664) ... * example using the Canny algorithm with custom image gradient. * Modified example to integrate new function canny with custom gradient	2016-08-16 10:51:09 +03:00
Suleyman TURKMEN	bb6f65c199	Update documentation ( tutorials )	2016-08-15 17:23:04 +03:00
Maksim Shabunin	8e06ae2762	Merge pull request #7078 from mshabunin:pr6862	2016-08-11 08:56:07 +00:00
Vadim Pisarevsky	5eee757658	Merge pull request #6949 from wiryls:FileStorageBase64DocsTests	2016-08-10 09:26:13 +00:00
ggargov	83b36bfd79	Added comments to clarify sample code ... Program flow is not easily apparent so hopefully ANY comments in the code could help new users.	2016-08-09 18:08:58 +03:00
Vladislav Sovrasov	46c8b09453	Improvements in camera_calibration tutorial code	2016-08-08 12:07:04 +03:00
MYLS	7429ed07be	solve warnings in sample file	2016-07-30 02:05:15 +08:00
MYLS	3935855365	Merge remote-tracking branch 'refs/remotes/opencv/master' into FileStorageBase64DocsTests ... # Conflicts: # modules/core/test/test_io.cpp	2016-07-30 01:08:27 +08:00
MYLS	08911cbfae	change code to snippet and do some cleaning. ... - use `@snippet` instead of `@code` in docs. - remove some functions that were not used.	2016-07-30 00:35:41 +08:00
Alexander Alekhin	60676dbbe8	fix build: move LOG macro from stitching public headers	2016-07-20 18:10:26 +03:00
Vadim Pisarevsky	abbc988fb5	Merge pull request #6812 from aleksandaratanasov:master	2016-07-19 17:21:09 +00:00
catree	42d5b1fb3b	Re-add peopledetect.cpp sample.	2016-07-19 10:42:47 +02:00
Vadim Pisarevsky	ce05d6cb89	Merge pull request #6773 from acinader:add-mask-to-match-template-demo	2016-07-18 21:14:19 +00:00
Vadim Pisarevsky	d62b0bd363	Merge pull request #6849 from alcinos:optflow_interface	2016-07-18 15:05:13 +00:00
Maksim Shabunin	474868a892	Merge pull request #6884 from alalek:migration	2016-07-18 07:49:38 +00:00
Vladislav Vinogradov	9f3b1f7e50	use HAVE_OPENGL instead of WITH_OPENGL for GPU opengl sample ... in this case the sample will not be built if OpenGL is not found	2016-07-15 15:14:56 +03:00
Vladislav Vinogradov	033c01afe2	fix video_reader GPU sample compilation after latest changes in master	2016-07-14 16:18:43 +03:00
Maksim Shabunin	a00f0c44ae	Merge pull request #6821 from sturkmen72:TickMeter_class_addition	2016-07-14 11:40:46 +00:00
Alexander Alekhin	3e77731f7e	Merge pull request #6824 from dozyc:tapi_hog_sample	2016-07-13 15:18:14 +00:00
Alexander Alekhin	ddc0b42bc3	migration: github.com/opencv/opencv	2016-07-12 12:51:12 +03:00
Arthur Cinader	0ed250cb5d	Implement PR feedback: ... 1. Explain grayscale input still read as three channel 2. Fix typo 3. Add more details to image match explanation to include the use of masks	2016-07-11 15:21:47 -04:00
LaurentBerger	62a87ce38c	Issue 6780	2016-07-07 09:29:41 +02:00
Arthur Cinader	2b08f29543	Allow for an optional mask for MatchTemplate_Demo	2016-06-30 17:04:25 -07:00
Alexander Alekhin	8184535de1	samples: repair viz tutorial	2016-06-30 17:21:31 +03:00
Alexander Alekhin	b7735b3400	Merge pull request #6731 from jokereactive:viz_sample	2016-06-30 12:41:52 +00:00
Alexander Alekhin	69bd6dad1f	Merge pull request #6029 from sturkmen72:patch-7	2016-06-29 11:55:09 +00:00
Alexander Alekhin	6b511751f5	Merge pull request #6619 from Slonegg:openni2_ir_stream	2016-06-28 05:21:25 +00:00
Dmitry Trifonov	f9e6741807	added support for OpenNI2 IR stream #4366	2016-06-27 10:04:59 -07:00
Simon Hänisch	6489d8a96f	update watershed.py: check if windows are still open ... change the `while` loop to check if the two windows created by this example still exist, stop the program otherwise	2016-06-27 17:03:37 +02:00
sarthak	43dca117b9	opencv viz bug ... removed binary update	2016-06-27 14:12:55 +05:30
Suleyman TURKMEN	11ca1c95f8	update cpp samples and tutorials	2016-06-26 20:55:00 +03:00
Suleyman TURKMEN	d2bad6febb	cv::TickMeter class addition	2016-06-23 19:06:57 +03:00
Aleksandar Atanasov	0637ca21dc	Update houghlines.py	2016-06-13 09:00:42 +02:00
Aleksandar Atanasov	4fa86dad26	Update houghcircles.py	2016-06-13 09:00:29 +02:00
Aleksandar Atanasov	445349dd7d	Same fix as with the houghcircles ... Moved second `imshow()` inside the if-statement to prevent error when no lines have been found and the function is called with an empty `cdst`.	2016-06-12 12:55:29 +02:00
Aleksandar Atanasov	c5bbc0353c	Added small fix when circles are not detected ... I noticed that I missed the fact that `cimg` is used in the second `imshow()` call. Changed the scope of the second function call to be within the if-statement. Otherwise in cases where have not been detected the second `imshow()` will attempt to use `cimg` which will be empty leading to an error.	2016-06-12 12:54:16 +02:00
Aleksandar Atanasov	25e2e8aa3c	Removed trailing spaces at line 32	2016-06-09 07:18:47 +02:00
Vladislav Sovrasov	901e1e4608	Update HAL samples	2016-06-03 11:52:30 +03:00
Aleksandar Atanasov	14deab252b	Fix houghlines.py when no lines found ... In the C++ equivalent of this example a check is made whether the vector (here in Python we have a list) actually has any lines in it that is whether the Hough lines function has managed to find any in the given image. This check is missing for the Python example and if no lines are found the application breaks.	2016-06-02 11:00:23 +02:00
Aleksandar Atanasov	cf0df733da	Fix houghcircles.py when no circles found ... In the C++ equivalent of this example a check is made whether the vector (here in Python we have a list) actually has any circles in it that is whether the Hough circles function has managed to find any in the given image. This check is missing for the Python example and if no circles are found the application breaks.	2016-06-02 10:58:46 +02:00
berak	a2b353d178	Update non_linear_svms.cpp ... fix for #6598	2016-05-30 06:56:28 +02:00
DozyC	6c4aae98f7	tapi examples - Removing defaults from all command line switches accessed with has()	2016-05-19 23:27:05 -07:00
CSBVision	d72625d506	neural_network.cpp added	2016-05-19 15:40:42 +02:00
DozyC	3db19c046b	Fix command line argument handling, fixes #6525	2016-05-10 17:20:59 -07:00
Julien Nabet	a29c814bd8	cppcheck: fix some reports ... All of these: (performance) Prefer prefix ++/-- operators for non-primitive types. [modules/calib3d/src/fundam.cpp:1049] -> [modules/calib3d/src/fundam.cpp:1049]: (style) Same expression on both sides of '&&'.	2016-04-29 15:41:39 +02:00
Alexander Alekhin	6e5e5d87df	Merge pull request #6448 from alalek:merge-2.4	2016-04-25 16:56:51 +00:00
Vadim Pisarevsky	5ed4e1b887	Merge pull request #6459 from eliao:Fix6457	2016-04-25 13:07:51 +00:00
Eric Liao	f87b175a19	Fix 6457 ... Allow configuration of the square size in stereo_calib.	2016-04-22 14:49:43 -07:00
Eric Liao	d3aaf8acf3	Change hardcoded relative path for instrinsics file to current path, matching the extrinsics file. ... https://github.com/Itseez/opencv/issues/6456	2016-04-22 14:14:25 -07:00
Alexander Alekhin	67a734ce73	Merge branch '2.4' into master ... Commits: 67fe57a add fixed video db0ae2c Restore 2.4 source branch for bug fix 6317. 97ac59c Fix a memory leak indirectly caused by cvDestroyWindow eb40afa Add a workaround for FFmpeg's color conversion accessing past the end of the buffer 421fcf9 Rearrange CvVideoWriter_FFMPEG::writeFrame for better readability 912592d Remove "INSTALL_NAME_DIR lib" target property bb1c2d7 fix bug on border at pyrUp	2016-04-21 20:15:08 +03:00
StevenPuttemans	67fe57a0a3	add fixed video	2016-04-19 15:30:49 +02:00
Maksim Shabunin	ba3b1de93f	Updates for XCode 7.3	2016-04-17 20:21:29 +03:00
Maksim Shabunin	fc5e32c7ac	Merge pull request #6305 from rishirajsurti:master	2016-04-14 08:42:40 +00:00
rishirajsurti	4a9170ba42	Thresholding Tutorial using inRange function on a video	2016-04-14 11:55:52 +05:30
Maksim Shabunin	36477fdefa	Merge pull request #6344 from anatolix:kalmanpyfix	2016-04-12 15:55:55 +00:00
Fraser Harris	0634808bf3	Added description of the AR model	2016-03-31 17:57:55 -07:00
Anatoly Orlov	1740218ee0	small platform compatability fix for ESC key	2016-03-29 20:02:35 +03:00
Anatoly Orlov	2be805ce29	kalman.py was broken totally ... 1. Following condition is True on each iteration becuase -1 % 0xFF is 255 not -1 code = cv2.waitKey(100) % 0x100 if code != -1: break this were resetting point position on each cycle not on key press as intended 2. Previous small bug were masking serious bug with matrix operation on matrices of incorrect size. As the result on 2nd iteration of internal cycle program has crushed. I have fixed it too, matrix operation was taken from examples/cpp/kalman.cpp where it looks like randn( processNoise, Scalar(0), Scalar::all(sqrt(KF.processNoiseCov.at<float>(0, 0)))); which is something totally different from previous code here. Example behave as it should now, i.e. point moving by circle trajectory as in C++ example.	2016-03-29 18:27:35 +03:00
Vadim Pisarevsky	1e1dc1429f	Merge pull request #6321 from mshabunin:hal_cmake	2016-03-27 08:06:24 +00:00
Vladislav Sovrasov	1f8fd5382c	Replace of some synthetic scenes in python samples	2016-03-24 20:05:26 +03:00
Maksim Shabunin	727743809e	Using find_package to import custom HAL library	2016-03-24 17:05:54 +03:00
Maksim Shabunin	26416343c4	Merge pull request #6300 from berak:fix_akaze_sample	2016-03-21 14:01:17 +00:00
berak	e0c65499fd	remove opencv_contrib dependancy from planar_tracking.cpp	2016-03-19 10:29:22 +01:00
Bleach666	93e50dabcd	fix build detect_mser sample in vc2010	2016-03-16 16:51:20 +02:00
berak	79ac072e6c	train_svmsgd.cpp : float response ... responses must be float, else we trigger an assertion in line 150	2016-03-14 08:09:36 +01:00
Vadim Pisarevsky	fbc221d334	Merge pull request #6096 from mnoskova:mn/SVMSGD_to_opencv3_0	2016-03-12 17:16:35 +00:00
Vadim Pisarevsky	cd1426ba8d	Merge pull request #6025 from sovrasov:new_python_tests	2016-03-12 17:11:19 +00:00
Alexander Alekhin	05a68fd82b	Merge pull request #6118 from Emoters:hotfix/planar_tutorial_fixes	2016-03-03 17:24:08 +00:00
Vladislav Sovrasov	0c6e09f060	Changes in facedetect test	2016-03-03 11:06:21 +03:00
Vladislav Sovrasov	87fc75c6d7	Improvements in tests, bugfix in digits_video sample	2016-03-03 11:06:21 +03:00
Vladislav Sovrasov	54c07ba0ff	Add 2 new tests, bugfixed in old tests	2016-03-03 11:06:21 +03:00
Vladislav Sovrasov	86868176a2	Fix py3 comatibility	2016-03-03 11:06:21 +03:00
Vladislav Sovrasov	e90dc20361	Update letter_recog sample to current version of opencv interfaces	2016-03-03 11:06:21 +03:00
Vladislav Sovrasov	d579f08093	Fix mouse control in asift and find_obj samples	2016-03-03 11:06:21 +03:00
Vladislav Sovrasov	3a51cae208	Fix rectangle selection in some of python samples	2016-03-03 11:06:21 +03:00
Vladislav Sovrasov	ab4d375349	Add new tests on python	2016-03-03 11:06:20 +03:00
Vitaly Tuzov	25b4d8a1b5	Added images necessary for tests	2016-02-26 12:42:35 +03:00
Marina Noskova	53711ec29d	Deleted default value for parameters in docs. ... Added some asserts.	2016-02-25 19:12:54 +03:00
Marina Noskova	74c87a26a5	Delete function areClassesEmpty().	2016-02-25 15:31:07 +03:00
Marina Noskova	f3c4a6aab8	Rename parameters lambda, gamma0 and c.	2016-02-24 13:22:07 +03:00
Maksim Shabunin	8c29380471	Merge pull request #6105 from mshabunin:tutorial-folder-correction	2016-02-15 13:10:45 +00:00
Eric Zavesky	77fa8d9d5a	- fix windows-based warnings for type casts	2016-02-15 05:37:54 -06:00
Marina Noskova	ff54952769	Corrected spelling mistakes	2016-02-15 14:35:36 +03:00
Eric Zavesky	335f7e7916	- trim whitespace, as required by build machine	2016-02-15 05:33:37 -06:00
Eric Zavesky	d7e57f2152	- fix typo from last minute change	2016-02-15 04:54:59 -06:00
Eric Zavesky	4c5af4f361	- add ROI selection, allow device input, use BB for area exclusion ... - previously BB was ignored for first frame, now masks analysis area - also allow real-time feedback of processing	2016-02-15 04:27:28 -06:00
Eric Zavesky	4546139844	- remove zero threshold that prevents ORB from finding any local features	2016-02-15 04:26:03 -06:00
Maksim Shabunin	6c0c0466c6	Tutorials: moved Megamind.avi files to samples/data folder	2016-02-12 13:44:14 +03:00
Maksim Shabunin	359acc0d33	Tutorials: moved imgcodecs and videoio tutorials to separate pages	2016-02-12 13:35:46 +03:00
Marina Noskova	5496dedd6a	Fixed warnings.	2016-02-10 19:46:24 +03:00
Marina Noskova	05353a1492	Removed trailing whitespaces	2016-02-10 16:59:12 +03:00
Marina Noskova	41c0a38344	Fixed test samples for tests with different borders ... Added new test (separating two points)	2016-02-10 16:59:12 +03:00
Marina Noskova	bfdca05f25	Added margin type, added tests with different scales of features. ... Also fixed documentation, refactored sample.	2016-02-10 16:59:12 +03:00
Marina Noskova	acd74037b3	Increasing the dimension of features space in the SVMSGD::train function.	2016-02-10 16:59:11 +03:00
Marina Noskova	40bf97c6d1	Refactored SVMSGD class	2016-02-10 16:56:14 +03:00
alcinos	6e3b90de9b	Add static creator for TVL1 optical flow class	2016-01-28 20:03:28 +01:00
Alexander Fedorov	474c53ac71	Fixed parser for img1_filename and img2_filename. ... Without fixes after 68 line (img1_filename = parser.get<std::string>(0);) OpenCV Error: ./stereo_matching im0.png im1.png --max-disparity=16 --blocksize=17 OpenCV Error: Bad argument (undeclared position 0 requested) in getByIndex, file /home/entodi/opencv/modules/core/src/command_line_parser.cpp, line 169 terminate called after throwing an instance of 'cv::Exception' what(): /home/entodi/opencv/modules/core/src/command_line_parser.cpp:169: error: (-5) undeclared position 0 requested in function getByIndex	2016-01-18 15:34:41 +03:00
BinMatrix	c7481c55f7	Fix the mouse bug and the problem of collapse	2016-01-13 19:04:17 +08:00
Alexander Alekhin	cdb9c60dcb	gpu samples: fix REMOVE_ITEM error	2015-12-31 02:24:54 +03:00
Ishank gulati	24da1ba3dc	added videoio docs and tutorials	2015-12-26 10:48:01 +05:30
Alexander Alekhin	613b289325	python: add launch script for winpack python demo	2015-12-18 15:59:02 +03:00
Alexander Alekhin	a8e2922467	rename samples/{python2 -> python}	2015-12-18 11:00:32 +03:00
Alexander Alekhin	323e24e3ef	change links from samples/python2 to samples/python	2015-12-18 11:00:30 +03:00
Vadim Pisarevsky	2ecb48921b	Merge pull request #5802 from bastelflp:py3samples_docstr	2015-12-18 07:20:53 +00:00
flp	0c5d9e18d1	Removed outdated tutorial link	2015-12-18 01:34:57 +01:00
Alexander Alekhin	03e74330fa	Merge pull request #5828 from mshabunin:CommandLineArgs	2015-12-17 17:46:37 +00:00
Vadim Pisarevsky	9aeb8c8d5a	Merge pull request #5810 from mshabunin:hal_interface	2015-12-17 16:48:02 +00:00
ValeryTyumen	297808e6b9	Feature #3957	2015-12-17 18:19:39 +03:00
Maksim Shabunin	c04d62db8b	HAL samples readme file updated	2015-12-17 16:09:36 +03:00
Maksim Shabunin	d214770d5b	HAL samples: renamed and added readme	2015-12-17 13:25:47 +03:00
Maksim Shabunin	84f37d352f	HAL moved back to core	2015-12-17 12:33:23 +03:00
flp	32737df1b5	Print found calibration data	2015-12-16 22:01:18 +01:00
Alexander Alekhin	491a3fdebc	android samples: force setVisibility (see #5812)	2015-12-16 14:31:49 +03:00
Alexander Alekhin	3b87e3fa20	Merge pull request #5812 from qubick:master	2015-12-16 10:05:34 +00:00
qubick	5502f0b45d	surfaceview import	2015-12-15 12:35:21 -07:00
Alexander Alekhin	8f60740205	fix build warning (unreachable code) and exit error codes	2015-12-15 22:06:11 +03:00
qubick	1434f55cb9	camera view was enabled to visible when the app launched	2015-12-15 11:38:56 -07:00
Alexander Alekhin	31d0dcf28e	fixup	2015-12-15 15:54:45 +03:00
Maksim Shabunin	574280cd3a	Merge pull request #5784 from alalek:distrib_fix	2015-12-15 12:24:36 +00:00
flp	b6ce4a527e	added docstring to python files	2015-12-15 01:03:50 +01:00
flp	14c5ef8db4	Added .gitignore for tmp files created by examples	2015-12-15 01:03:50 +01:00
flp	006d5ac0a5	Adapted for py2/py3 compatibility	2015-12-15 01:03:50 +01:00
Vadim Pisarevsky	ba71caca04	fixed digits.py sample	2015-12-14 16:37:19 +03:00
flp	4ed2d6328b	Python samples adapted for Python3 compatibility ... Common fixes: - print function - int / float division - map, zip iterators in py3 but lists in py2 Known bugs with opencv 3.0.0 - digits.py, called via digits_video.py: https://github.com/Itseez/opencv/issues/4969 - gaussian_mix.py: https://github.com/Itseez/opencv/pull/4232 - video_v4l2.py: https://github.com/Itseez/opencv/pull/5474 Not working: - letter_recog.py due to changed ml_StatModel.train() signature	2015-12-13 02:49:54 +01:00
Alexander Alekhin	1836d41b5c	warning fix (MSVS2015)	2015-12-12 15:23:31 +03:00
Alexander Alekhin	8f732f2cfe	fix samples deps ... some tutorials depends on contrib modules	2015-12-12 15:23:31 +03:00
Deanna Hood	0d706f6796	Return uncompressed support vectors for getSupportVectors on linear SVM (Bug #4096)	2015-12-10 18:31:02 +03:00
niederb	d8e3971e7f	Fixed variable importance in rtrees	2015-12-10 18:09:15 +03:00
Alexander Alekhin	d86d8ed909	Merge 2.4 into master ... PR #2968: cce2d99 8578f9c Fixed bug which caused crash of GPU version of feature matcher in stitcher The bug caused crash of GPU version of feature matcher in stitcher when we use ORB features. PR #3236: 5947519 Check sure that we're not already below required leaf false alarm rate before continuing to get negative samples. PR #3190 fix blobdetector PR #3562 (part): 82bd82e TBB updated to 4.3u2. Fix for aarch64 support. PR #3604 (part): 091c7a3 OpenGL interop sample reworked not ot use cvconfig.h PR #3792: afdf319 Add -L for CUDA libs path to pkg-config Add all dirs from CUDA_LIBS_PATH as -L linker options to OPENCV_LINKER_LIBS. These will end up in opencv.pc. PR #3893: 122b9f8 Turn ocv_convert_to_lib_name into a function PR #5490: ec5244a fixed memory leak in findHomography tests PR #5491: 0d5b739 delete video readers PR #5574 PR #5202	2015-12-08 10:24:54 +03:00
LaurentBerger	bef009c9dd	fixed #5005: stitching_detailed.cpp	2015-11-23 21:55:59 +01:00
Vadim Pisarevsky	c4edd86aeb	Merge pull request #5400 from dtmoodie:thrust_tutorial	2015-11-23 18:36:42 +00:00
Maksim Shabunin	0d29774401	Merge pull request #5298 from slothspot:master	2015-11-22 18:08:21 +00:00
Maksim Shabunin	eebd4cad66	Fix compilation problems with XCode 7.1.1 and cmake 3.3.2	2015-11-17 18:52:55 +03:00
Dan	aa14b6d2f3	Merge branch 'thrust_tutorial' of http://github.com/dtmoodie/opencv into thrust_tutorial	2015-11-10 12:29:51 -05:00
Dan	01f40cfafc	Corrected the case where channel == -1	2015-11-10 12:29:29 -05:00
brossetti	4194b7effe	fixed bug on left mouse button click ... Adding None as outImage in pos3 of cv2.drawKeypoints. Fixes bug that throws 'TypeError: Required argument 'outImage' (pos 3) not found' on left mouse button click	2015-11-09 04:37:59 -05:00
Viet Dinh	ed0065266e	update fixing bug #5599	2015-11-02 08:38:05 -05:00
Vadim Pisarevsky	7ca9e49749	Merge pull request #5607 from n3011:patch-1	2015-11-02 11:55:12 +00:00
Vadim Pisarevsky	d55e44f0b7	Merge pull request #5608 from n3011:patch-2	2015-11-02 11:14:39 +00:00
Vadim Pisarevsky	92298c88bd	Merge pull request #5609 from n3011:patch-3	2015-11-02 11:14:24 +00:00
Ishant Mrinal Haloi	47b2511f07	Update driver_api_stereo_multi.cpp	2015-11-02 15:08:27 +08:00
Ishant Mrinal Haloi	52b4fe63c1	Update cascadeclassifier_nvidia_api.cpp	2015-11-02 15:07:45 +08:00
Ishant Mrinal Haloi	46be45b4f7	Update driver_api_multi.cpp	2015-11-02 15:06:38 +08:00
Ishant Mrinal Haloi	64eb69cb15	Update multi.cpp	2015-11-02 15:05:45 +08:00
Alexander Alekhin	9a0beda037	Merge pull request #5489 from paroj:v4l2noconvert	2015-10-23 16:35:36 +00:00
Maksim Shabunin	490b327be9	Merge pull request #5365 from sturkmen72:patch-2	2015-10-22 12:25:48 +00:00
Alexander Alekhin	4dc2313527	Merge pull request #5552 from hyunkim9123:camshift-2.4	2015-10-21 06:13:38 +00:00
Suleyman TURKMEN	fd4761ba31	Update face detection samples	2015-10-20 19:09:21 +03:00
Maksim Shabunin	3119f0a61b	Merge pull request #5519 from hyunkim9123:camshift_py	2015-10-20 14:43:33 +00:00
Pavel Rojtberg	54e7f08760	add python sample to test/ showcase new cap_v4l2 features	2015-10-18 14:13:44 +02:00
paul.kim	78a566611d	Fix the issue in mouse click event	2015-10-17 10:42:48 +09:00
Alexander Smorkalov	bf41e791ff	Merge pull request #5514 from asmorkalov:as/nonfree-independent-samples	2015-10-15 10:56:23 +00:00
paul.kim	d5d16bb3b1	Fix the issue in mouse click event	2015-10-15 11:09:31 +09:00
Alexander Smorkalov	341e7b3be2	Fixed samples build with nonfree.	2015-10-14 16:19:37 +03:00
Alexander Smorkalov	bba8c0beac	Made samples build independent from nonfree module.	2015-10-14 12:56:58 +03:00
Rodrigo Benenson	d8e470fc30	CommandLineParser missing gpu option ... As is it was not possible to use CUDA.	2015-10-13 19:04:06 +02:00
Alexander Smorkalov	ff00220302	Set of lintain warning fixes for -samples debian package.	2015-10-13 16:32:53 +03:00
Alexander Alekhin	0f1fdd885d	Merge pull request #5471 from StevenPuttemans:add_images_python_tutorials	2015-10-09 11:31:32 +00:00
Alexander Alekhin	441eeef319	Merge pull request #5470 from apavlenko:android_camera_gl_view	2015-10-08 13:31:51 +00:00
Andrey Pavlenko	24ca6aaada	fix build with CMake ... now it builds by the command: `cmake.exe -Wno-dev -GNinja -DCMAKE_MAKE_PROGRAM="path\to\ninja\ninja.exe" -DCMAKE_TOOLCHAIN_FILE=../opencv3/platforms/android/android.toolchain.cmake -DANDROID_ABI="armeabi-v7a with NEON" -DANDROID_SDK_TARGET=21 -DANDROID_NATIVE_API_LEVEL=14 -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON -DBUILD_ANDROID_EXAMPLES=ON -DINSTALL_ANDROID_EXAMPLES=ON -DWITH_OPENCL=YES -DANDROID_OPENCL_SDK=path\to\OpenCL ../opencv`	2015-10-08 13:48:46 +03:00
StevenPuttemans	913c266b4a	adding missing images from python tutorials, like chessboard.png, simple.jpg, home.jpg, fly.png, ...	2015-10-08 11:59:54 +02:00
Andrey Pavlenko	23fea91e84	minor fixes	2015-10-08 12:37:59 +03:00
Andrey Pavlenko	a041105491	refactoring Tutorial-4 using new OpenCV CameraGLSurfaceView	2015-10-08 01:26:54 +03:00
Dan Moodie	f332f98757	Removed last trailing whitespace. Can't believe I missed it.	2015-10-05 20:21:46 -04:00
Dan	e4184195a2	Looks like something automatically added tabs back in after I already fixed the white space. :/	2015-09-28 09:37:10 -04:00
Kauê de Moraes Vestena	1bd18836d7	little fixes and correction of a conceptual error ... Previously, there's no way to the user see the found corners, i've changed that. In a cout, are write that: "average reprojection err = " But it isn't a "reprojection error" at all, it is a mean of each EPIPOLAR error, wich occur when the product x' * F * x is not equal to zero. (x and x' are the same points in the right and left scene) (the RMS that explain the average absolute reprojection error is given by the return of the stereoCalibrate() function) At least, i think it's interesting to initialize the camera matrices before. Thank you all for this amazing code. Apologize my weak english.	2015-09-27 15:53:30 -03:00
Dan	3efe131480	Merge branch 'thrust_tutorial' of http://github.com/dtmoodie/opencv into thrust_tutorial ... Conflicts: samples/cpp/tutorial_code/gpu/gpu-thrust-interop/Thrust_interop.hpp	2015-09-25 08:58:53 -04:00
Dan	ab84de967e	More whitespace fixes.	2015-09-25 08:56:37 -04:00
Alexander Alekhin	58a11ac079	Merge pull request #5403 from sturkmen72:patch-9	2015-09-25 12:08:13 +00:00
Suleyman TURKMEN	69d84c8f3e	Update how_to_scan_images.cpp	2015-09-25 14:32:58 +03:00
Maksim Shabunin	09ba5a28d0	Merge pull request #5393 from enesates:patch-1	2015-09-25 07:35:47 +00:00
Dan Moodie	7376c5311b	Fixed tabs in whitespace.	2015-09-24 14:29:17 -04:00
Dan	12dcb1555e	Missed one conversion of CV_TYPE to cv::DataType	2015-09-24 10:01:26 -04:00
Dan	00c2930709	improved comments.	2015-09-24 09:32:46 -04:00
Dan	23fc5930b7	Improved thrust interop tutorial.	2015-09-24 09:32:38 -04:00
Dan	09d392f09d	Added thrust tutorial.	2015-09-24 09:32:27 -04:00
Dan	a80e0cf8bd	Added tutorials for using thrust.	2015-09-24 09:32:18 -04:00
Alexander Alekhin	acec99876d	Merge pull request #5363 from avershov:opencl-vaapi-detect	2015-09-24 12:32:03 +00:00
Enes Ateş	5df2713b16	XML file path correction ... in documentation exact path is images/CameraCalibration/VID5 see also PR #5393	2015-09-24 10:34:42 +02:00
Alexey Ershov	5feca50f58	changed device detection procedure, added resizing surface to bigger size ... removed unused context_id2; changed blur size 7x7 to 3x3; added short comments removed unnecessary call to convertFromVASurface() replaced dumpSurface() with writeImage() added infile cmdline parameter, input image loaded by imread()	2015-09-23 17:35:49 +03:00
Enes Ateş	769fe82743	XML file path correction ... in documentation exact path is images/CameraCalibration/VID5	2015-09-23 13:19:17 +02:00
Alexander Alekhin	44ab680613	Merge pull request #5341 from blebo:py3compat	2015-09-21 11:47:26 +00:00
Vadim Pisarevsky	9533982729	Merge pull request #5272 from avershov:opencl-vaapi-fallback	2015-09-14 11:54:20 +00:00
Adam Gibson	4f2612fcfd	Removed trailing whitespace from squares.py compatibility comment.	2015-09-14 13:03:16 +08:00
Adam Gibson	a413423ff6	Reverted _doc.py to Python 2-only version. Interim measure to prevent docs from failing during build, until all samples are updated with Python 2/3 compatibility.	2015-09-14 12:24:08 +08:00
Adam Gibson	b57be28920	Various Python samples updated for Python 2/3 compatibility.	2015-09-14 00:00:22 +08:00
Alexey Ershov	22bb5d1fcc	implemented sample build in fallback mode without interop	2015-09-10 19:30:19 +03:00
Alexey Ershov	f533c05644	sample changed to execute only one mode (interop on/off) per run	2015-09-10 15:41:04 +03:00
Vadim Pisarevsky	6208ab4e49	Merge pull request #5304 from paroj:calib_feye	2015-09-09 11:00:40 +00:00
Vadim Pisarevsky	8660d550d3	Merge pull request #5302 from berak:patch-2	2015-09-09 10:34:29 +00:00
Alexey Ershov	e0b3751c17	added run iteration without timing to complete internal initializations	2015-09-08 21:01:57 +03:00
berak	602bd60c3a	Update cloning_gui.cpp	2015-09-04 17:13:58 +02:00
Pavel Rojtberg	d0e16b21d4	add support for fisheye camera model	2015-09-04 15:54:34 +02:00
berak	dc265071d0	Update PnPProblem.cpp	2015-09-04 10:57:33 +02:00
Alexey Ershov	68a0347ff9	fallback path & sample timing implemented ... fixed trailing whitespaces renamed files *vaapi* to *va_intel* changed names vaapi* to va_intel*	2015-09-04 02:42:49 +03:00
Dmitry Melnichenko	319b6a447f	Change SURF to ORB in Java-Sbt sample to remove dependency on external non-free modules	2015-09-03 17:16:59 +03:00
Dmitry Melnichenko	b484f377dd	Fix build of Java-Sbt sample	2015-09-03 15:18:42 +03:00
Andrey Pavlenko	74fcefedcb	giving a chance for OpenCL 1.1 devices	2015-08-27 14:05:32 +03:00
Andrey Pavlenko	8031742817	unused imports clean-up	2015-08-27 14:05:31 +03:00
Andrey Pavlenko	43b76e548b	adding NO_PROCESSING (i.e. just preview) mode	2015-08-27 14:05:31 +03:00
Andrey Pavlenko	016011fdf8	fixing start faulure on some devices; syncronization improvements	2015-08-27 14:05:31 +03:00
Vadim Pisarevsky	96fa0ef752	Merge pull request #5115 from ManuelFreudenreich:hog_variable	2015-08-25 14:45:53 +00:00
Alexander Alekhin	1b1246cbae	samples: fix OpenCL detection / build warning	2015-08-24 15:52:14 +03:00
Alexander Alekhin	44f8670719	Merge pull request #5171 from avershov:opencl-vaapi-interop	2015-08-21 12:47:14 +00:00
Alexey Ershov	a8656ea20f	implemented core support & sample ... fixed whitespaces fixed issues fixed issue fixed module statement issues fixed access mode added initialization check fixed warning	2015-08-21 02:44:03 +03:00
Alexander Alekhin	ca5e07d342	Merge pull request #5199 from TheodoreT:tickmeter_update	2015-08-17 17:18:31 +00:00
theodore	9449af8ada	1e-3 -> 1e3	2015-08-17 15:52:16 +02:00
Ilya Lavrenov	7da16d6f47	used proper method	2015-08-17 01:44:50 +03:00
theodore	6d68f72473	bug fix fro the TickMeter class	2015-08-15 14:12:40 +02:00
Alexander Alekhin	03bab0fc0d	tutorial-4-opencl: enable build with OpenCV	2015-08-13 13:32:23 +03:00
Alexander Alekhin	e1ad86c1fa	android samples: update way to attach native part of OpenCV ... OPENCV_ANDROID_SDK - OpenCV Android SDK location (or OpenCV build dir) Can be passed via ndk-build parameter or environment variable.	2015-08-12 18:37:29 +03:00
Alexander Alekhin	d789c810bf	Merge pull request #4239 from apavlenko:android_ocl_sample2	2015-08-12 14:00:36 +00:00
ManuelFreudenreich	89889ae8ea	changed hog to work with variable parameters and changed the hog sample to test it with more options ... added comments and tests	2015-08-12 09:16:20 +02:00
Alexander Alekhin	c119e04947	fix opengl sample build on Linux (#5067)	2015-08-11 22:49:19 +03:00
Alexey Ershov	c7f420ba75	applied changes proposed in 5122	2015-08-06 20:55:41 +03:00
Adam Geitgey	e976c448b7	Prevent grabcut, houghcircles and houghlines python2 demos from running automatically while browsing demos in the demo list viewer	2015-08-04 14:01:51 -07:00
Alexander Alekhin	da948c82b4	Merge pull request #5106 from vladimir-dudnik:opencl-opengl-upd	2015-08-03 09:57:06 +00:00
Alexander Alekhin	0f8c46f368	Merge pull request #5107 from vladimir-dudnik:d3d-interop-upd	2015-08-03 09:56:37 +00:00
Vadim Pisarevsky	02906bf23a	Merge pull request #5102 from nzjrs:fix-python-digits	2015-08-03 05:40:24 +00:00
Vladimir Dudnik	57bff43aec	fixed not initialized nv12_cpu_copy surface, remove odd code	2015-08-01 02:10:05 +03:00
Vladimir Dudnik	5c4c8bcea3	update opencl-opengl interop sample (remove odd no processing branch)	2015-08-01 01:16:06 +03:00
John Stowers	e05b6bb6e7	remove picloud from digits_adjust ... the service has been closed since 2013/2014	2015-07-31 09:17:16 +02:00
John Stowers	c4c3f1b25e	fix digits.py to not ignore model parameters ... otherwise model is only ever trained with default parameters, and digits_adjust does nothing (for example)	2015-07-31 09:14:20 +02:00
Andrey Pavlenko	56bde913d4	adding mode switching via menu	2015-07-31 03:39:26 +03:00
Andrey Pavlenko	9ab291ea1c	adding displaying FPS	2015-07-31 01:52:10 +03:00
Alexander Alekhin	fe0a17e78f	fix build with Win7 SDK	2015-07-30 23:23:01 +03:00
Andrey Pavlenko	0185cb27eb	excluding libOpenCL.so from the APK	2015-07-30 23:18:45 +03:00
Alexey Ershov	ea10290153	change displaying of fps to time (ms)	2015-07-30 19:57:11 +03:00
Maksim Shabunin	6922b94894	Merge pull request #5093 from sturkmen72:patch-5	2015-07-30 13:04:48 +00:00
Alexander Alekhin	2b2bc83b61	Merge pull request #4238 from vladimir-dudnik:d3d11-nv12-interop	2015-07-30 10:36:25 +00:00
Suleyman TURKMEN	9dd41a8187	Update how_to_scan_images.cpp	2015-07-30 13:17:17 +03:00
Vladimir Dudnik	6bd01a96d9	finished with NV12 support for D3D11-interop. Now, if texture is in NV12 format then it will be converted to/from BGR UMat.	2015-07-29 19:52:05 +03:00
Vladimir Dudnik	d4774ead43	d3d11-nv12 interop ... fixed issues with ocl nv12 cvt kernel finisged ocl nv12-to-rgba kernel, update dx-interop samples. (ocl rgba-to-nv12 kernel will be added later) an attempt to fix build issue fix for non opencl build issue fix typo fix compilation warnings fix compile issue for Mac (OpenCL) add convertion from rgba to nv12 (still need to debug kernel) remove empty line at the EOF fixed compilation warning	2015-07-29 19:52:03 +03:00
Alexey Ershov	0a4830b3d5	added command line processing	2015-07-29 13:51:03 +03:00
Alexey Ershov	b102bc6678	fixed memory leaks	2015-07-29 11:07:11 +03:00
Andrey Pavlenko	c8f863dfc5	minor fixes	2015-07-29 00:13:35 +03:00
Andrey Pavlenko	0e4bb2b49f	adding OpenCV with TAPI (UMats)	2015-07-27 04:04:56 +03:00
Andrey Pavlenko	274aba1a89	adding OpenCL processing (Image2D-to-Image2D only, others will be added later)	2015-07-27 02:57:01 +03:00
Andrey Pavlenko	2a6d4b6ee2	Camera and Camera2 preview is rendered via OpenGL textures and can be modified on CPU via C++ code. No OpenCL yet.	2015-07-27 01:07:56 +03:00
Maksim Shabunin	ecd3661119	Merge pull request #4179 from sbokov:improvingStereoSGBM	2015-07-24 21:12:56 +00:00
sbokov	aea4157340	Adding new HAL-accelerated MODE_SGBM_3WAY ... New mode is approximately 2-3 times faster than MODE_SGBM with minimal degradation in quality and uses universal HAL intrinsics. A performance test was added. The accuracy test was updated to support the new mode.	2015-07-23 23:08:26 +03:00
Renato Florentino Garcia	ec0f901153	Remove an unneeded semicolon.	2015-07-21 14:54:06 -03:00
Alexander Alekhin	c0b544af70	Merge pull request #4209 from vladimir-dudnik:fix-opencl-opencv-interop-sample	2015-07-21 15:58:20 +00:00
Alexander Alekhin	c0ee03fab2	Merge pull request #4192 from avershov:opencl-opengl-buffer	2015-07-21 14:10:00 +00:00
Alexey Ershov	89392b2a6d	added convertToGLBuffer() & convertFromGLBuffer() functions; added OpenGL interop sample comment ... rewrite & change convertFromGLBuffer() & convertToGLBuffer() into acquireGLBuffer() & releaseGLBuffer(), respectively opengl sample: added buffer support tested and fixed buffer support on Windows change glFlush() call to glFinish() added UMat::release() call; fixed functions' names adopted & implemented API suggestion(s) from Alexander fixed unreachable code warning added more info to the mapGLBuffer/unmapGLBuffer description	2015-07-21 13:42:17 +03:00
Vladimir Dudnik	ef05318c69	fix opencl-opencv-interop.cpp issues reported by Dmitry Budnikov	2015-07-21 01:27:27 +03:00
Vladimir Dudnik	6c452addfe	changed output from fps to time (in msec). Notes for dx10 and dx11: the first measure is wrong (zero), the followiing are correct; measured time includes output text to surface.	2015-07-20 19:05:05 +03:00
Vladimir Dudnik	dee05f982b	compute fps changed (now only interop counts). fixed d3d10 and d3d11 print info method (there were issues with texture mapping)	2015-07-13 23:40:45 +03:00
Vladimir Dudnik	38723b0339	simplified sample's interface (remove odd "no processing" branch, add print to screen for processing mode)	2015-07-09 22:41:05 +03:00
Alexander Alekhin	f4cb8c0dfb	Merge pull request #4127 from avershov:opengl-opencl-sample	2015-07-02 11:24:10 +00:00
Vadim Pisarevsky	d0c43f16e0	Merge pull request #4155 from MSOpenTech:highgui_contrib	2015-06-29 12:44:16 +00:00
Alexey Ershov	8ed45609d0	fixed cleanup, fixed unused context	2015-06-29 11:46:31 +03:00
Maxim Kostin	ccdd1126f6	Updated sample to showcase highgui WinRT usage ... Signed-off-by: Maxim Kostin <v-maxkos@microsoft.com>	2015-06-26 23:41:39 +03:00
Alexander Alekhin	898b257261	replacement for #4160	2015-06-26 18:45:58 +03:00
Alexey Ershov	3f68787051	OpenGL OpenCL sample ... 057cd52 first versions: cv::ogl::convertFromGLTexture2D & cv::ogl::convertToGLTexture2D 5656e94 added autogenerated stuff for cl_gl.h 765f1fd resolved CL functions in opengl.cpp 9f9fee3 implemented function cv::ogl::ocl::initializeContextFromGLTexture2D() a792adb cv::ogl::ocl::initializeContextFromGLTexture2D() - added linux support (glx.h) 51c2869 added missing error message in function cv::ogl::ocl::initializeContextFromGLTexture2D() 513b887 fixed extension call in function cv::ogl::ocl::initializeContextFromGLTexture2D() 475a3e9 added CL-GL interop Windows sample (gpu/opengl_interop.cpp) 07af28f added building of CL-GL interop sample - Windows only befe3a2 fixed whitespace errors & doxygen warnings (precommit_docs) 551251a changed function name to cv::ogl::ocl::initializeContextFromGL(), removed unused argument 4d5f009 changed CL_DEVICES_FOR_GL_CONTEXT_KHR to CL_CURRENT_DEVICE_FOR_GL_CONTEXT_KHR 9fc3055 changed CL_DEVICES_FOR_GL_CONTEXT_KHR to CL_CURRENT_DEVICE_FOR_GL_CONTEXT_KH 6d31cee Revert "changed CL_DEVICES_FOR_GL_CONTEXT_KHR to CL_CURRENT_DEVICE_FOR_GL_CONTEXT_KH" cc6a025 added texture format check in cv::ogl::convertFromGLTexture2D() 063a2c1 CL-GL sample: added Linux implementation (Xlib/GLX) c392ae9 fixed trailing whitespace 85a80d0 fixed include files ae23628 excluded samples/opengl from build case 2 9870ea5 added android EGL support 530b64c added doxygen documentation comments to CL-GL interop functions	2015-06-26 14:15:12 +03:00
LaurentBerger	2f8ef61618	move data/detect_blob.png in samples/data	2015-06-22 17:51:01 +02:00
Vladimir Dudnik	217dd63e02	OpenCV-OpenCL interop (PR #4072): ... Commits: added new function, cv::ocl::attachContext(String& platformName, void* platformID, void* context, void* deviceID) which allow to attach externally created OpenCL context to OpenCV. add definitions of clRetainDevice, clRetainContext funcs removed definitions for clRetainContext, clRetainDevice fixed build issue under Linux fixed uninitialized vars, replace dbgassert in error handling remove function which is not ready yet add new function, cv::ocl::convertFromBuffer(int rows, int cols, int type, void* cl_mem_obj, UMat& dst, UMatUsageFlags usageFlags = cv::USAGE_DEFAULT) which attaches user allocated OpenCL clBuffer to UMat uncommented clGetMemObjectInfo definition (otherwise prevent opencv build) fixed build issue on linux and android add step parameter to cv::ocl::convertFromBuffer func suppress compile-time warning added sample opencl-opencv interoperability (showcase for cv::ocl::convertFromBuffer func) CMakeLists.txt modified to not create sample build script if OpenCL SDK not found in system fixed build issue (apple opencl include dir and spaces in CMake file) added call to clRetainContext for attachContext func and call to clRetainMemObject for convertFromBuffer func uncommented clRetainMemObject definition added comments and cleanup add local path to cmake modules search dirs (instead of replacing) remove REQUIRED for find_package call (sample build together with opencv). need to try standalone sample build opencl-interop sample moved to standalone build set minimum version requirement for sample's cmake to 3.1 put cmake_minimum_required under condition, so do not check if samples not builded remove code dups for setSize, updateContinuityFlag, and finalizeHdr commented out cmake_minimum_required(VERSION 3.1) add safety check for cmake version add convertFromImage func and update opencl-interop sample uncommented clGetImageInfo defs uncommented clEnqueueCopyImageToBuffer defs fixed clEnqueueCopyImageToBuffer defs add doxygen comments remove doxygen @fn tag try to restart buildbot add doxygen comments to directx interop funcs remove internal header, use fwd declarations in affected compile units instead	2015-06-19 13:33:22 +03:00
Alexander Alekhin	6ab9df5208	Merge pull request #4132 from mshabunin:fix-java-package	2015-06-18 16:13:23 +00:00
Ruslan Baratov	83b882039e	Update samples/cpp/example_cmake: no need to use include_directories	2015-06-17 17:53:05 +02:00
Maksim Shabunin	bfa77ff5a4	Increase android samples versions	2015-06-17 18:10:28 +03:00
sbokov	5123c3e52e	Added ground-truth disparity map for 'aloe'	2015-06-14 23:59:48 +03:00
Maksim Shabunin	39fdcf4df3	Merge pull request #4083 from mshabunin:java-engine	2015-06-03 17:17:36 +00:00
Maksim Shabunin	7ee79b73f6	AndroidMgr: fixed package build	2015-06-03 19:01:48 +03:00
berak	851ce27240	http://code.opencv.org/issues/4359 2.4 branch	2015-06-03 07:48:29 +02:00
berak	737a1e2f12	http://code.opencv.org/issues/4359, for master	2015-06-03 07:44:46 +02:00
Maksim Shabunin	caffbaafbe	Updated Manager for Android	2015-06-02 17:33:04 +03:00
Vadim Pisarevsky	24dea1c616	Merge pull request #3984 from LaurentBerger:ExampleCppORB	2015-05-29 21:36:43 +00:00
Evgeny Agafonchikov	fd860d7cd0	Adding backslash in macro-based paths ... of WINRT samples This removes requirement to add OPENCV_WINRT_INSTALL_DIR with backslash in the end in case trailing slash is presented VS handles duplicated slashes w/o issues	2015-05-29 09:36:42 +03:00
Vadim Pisarevsky	b46719b093	Merge pull request #4074 from vpisarev:objdetect_fixes	2015-05-28 19:43:51 +00:00
Vadim Pisarevsky	8b8fc9e66b	Merge pull request #4070 from techfort:fixpythonsample	2015-05-28 18:06:17 +00:00
Vadim Pisarevsky	036c438904	make facedetect.py work when the nested cascade is not specified	2015-05-28 19:01:56 +03:00
Vadim Pisarevsky	5e095c8fbd	Merge pull request #4022 from LaurentBerger:ExampleBLOB_MSER	2015-05-28 15:00:36 +00:00
Vadim Pisarevsky	f7ad192842	Merge pull request #4063 from Dikay900:2_4_to_master	2015-05-28 14:49:13 +00:00
Vadim Pisarevsky	58cf11bd44	Merge pull request #4069 from MSOpenTech:sample-face-contrib	2015-05-28 14:48:00 +00:00
Joe Minichino	47d8187bc3	fixed outdated params setting	2015-05-28 15:20:08 +01:00
Maxim Kostin	3408114602	Added video face detection. Restructured code. ... Signed-off-by: Maxim Kostin <v-maxkos@microsoft.com>	2015-05-28 13:42:59 +03:00
Joe Minichino	a4a2659dff	fixed digits.py sample to work with opencv 3	2015-05-27 15:43:52 +01:00
Maxim Kostin	aa932eab41	Adding WinRT face tracking sample. Works with asset images. Created by @ericmitt. ... Signed-off-by: Maxim Kostin <v-maxkos@microsoft.com>	2015-05-27 14:55:47 +03:00
Alexander Alekhin	75558ae75c	Merge pull request #4058 from mshabunin:latch-sample	2015-05-26 16:26:57 +00:00
Samyak Datta	e9c765ee2c	C++ sample code to detect facial features	2015-05-26 18:08:26 +02:00
Maksim Shabunin	330b3e87eb	Fixed latch sample build without contrib	2015-05-26 15:57:07 +03:00
Vadim Pisarevsky	8fb37606f6	Merge pull request #4032 from mshabunin:fix-pkg-config	2015-05-26 12:47:14 +00:00
Vadim Pisarevsky	60064b3de7	Merge pull request #4015 from GilLevi:AddingLATCH	2015-05-25 13:09:49 +00:00
GilLevi	a4e5b09ea4	fixed whitespace issue	2015-05-25 01:28:05 +03:00
Vadim Pisarevsky	8e392251ba	Merge pull request #4016 from vladimir-dudnik:directx-opencl-sample	2015-05-22 13:21:36 +00:00
Maksim Shabunin	3863dc5b2b	Updated pkg-config generation, added sample makefile	2015-05-22 16:09:07 +03:00
Vladimir Dudnik	c64a15294d	short description moved to the beginning of file	2015-05-22 14:12:00 +03:00
laurentBerger	b204013483	back to #include "opencv2/cvconfig.h"	2015-05-21 20:22:57 +02:00
Vladimir Dudnik	892684ebe5	add short description	2015-05-21 17:08:13 +03:00
laurentBerger	b116d6c6e8	use ifndef HAVE_GTK	2015-05-21 14:57:49 +02:00
laurentBerger	a6a0fc5b21	replace "cvconfig.h" it with "opencv2/cvconfig.h".	2015-05-21 14:01:11 +02:00
Piotr Dobrowolski	6d0407b65e	VideoCapture with digital camera and gPhoto2 library	2015-05-21 00:41:39 +02:00
GilLevi	05a45ef6dc	renamed LATCH	2015-05-21 00:04:24 +03:00
Vladimir Dudnik	af806bc816	replaced macros with template func	2015-05-19 16:08:25 +03:00
laurentBerger	268283ff16	suppress android and mac warnings	2015-05-16 22:54:53 +02:00
GilLevi	6613519c2e	added sample for LATCH	2015-05-16 22:37:38 +03:00
laurentBerger	546f70a6f0	some warnings and errors	2015-05-16 21:01:31 +02:00
GilLevi	f85eb23c3b	sample for LATCH	2015-05-16 21:15:09 +03:00
Vadim Pisarevsky	78e89ba3ff	Merge pull request #4001 from LaurentBerger:ExampleBLOB	2015-05-16 18:11:29 +00:00
laurentBerger	187ab0ca61	include cvconfig.h to use constant HAVE_OPENGL	2015-05-16 19:59:59 +02:00
laurentBerger	7cf5de0ed0	trailing whitespace and some bracket	2015-05-16 19:29:12 +02:00
laurentBerger	68e9d19743	An example how to use features2d for MSER. Data results are visualized in 3D using openglwith mouse or keyboard	2015-05-16 18:59:22 +02:00
Vladimir Dudnik	f0197006e0	removed original samples and replace them with new ones. modified new samples (reduce code duplication, add cmd line params and short description)	2015-05-16 00:40:05 +03:00
Maxim Kostin	3d20157d4f	Added sample Windows Universal application (UAP) using videoio logic for video preview and processing. ... Signed-off-by: Maxim Kostin <v-maxkos@microsoft.com>	2015-05-15 18:03:06 +03:00
Vladimir Dudnik	3cb4954d70	fixed new blank line at EOF	2015-05-14 12:08:14 +03:00
GilLevi	a41ac8fd40	added sample code for LATCH	2015-05-13 21:20:28 +03:00
laurentBerger	06b0fa6fc2	BLOB_MSER avec opengl	2015-05-13 18:03:58 +02:00
Vladimir Dudnik	450a276f87	directx opencl interop samples (with copy from opencl image2d to buffer)	2015-05-13 01:51:54 +03:00
laurentBerger	780f4ae7c5	try to implement remark included in message	2015-05-12 19:01:05 +02:00
laurentBerger	dfc508bb15	problem float constant and position of > in vector	2015-05-11 13:45:08 +02:00
laurentBerger	05bc7621e6	trailing whitespace	2015-05-11 13:20:52 +02:00
laurentBerger	a94fdbe0f0	Example about BLOB with a new image in data folder	2015-05-11 13:13:20 +02:00
laurentBerger	e7fcffeead	Exxemple MSER et BLOB séparés	2015-05-11 12:48:18 +02:00
laurentBerger	16e20e5c73	An another improvement?	2015-05-09 10:29:53 +02:00
laurentBerger	9e97d7b4db	Etude de MSER	2015-05-09 08:44:18 +02:00
laurentBerger	26d7da68fc	warning C4101: 'e' line 146	2015-05-08 09:57:05 +02:00
laurentBerger	f6f5b6035b	trailing whitespace	2015-05-07 22:55:38 +02:00
laurentBerger	966d50762d	Try to include comment from @eduardo and @berak ... Akaze descriptor with DESCRIPTOR_KAZE_UPRIGHT added	2015-05-07 22:48:13 +02:00
laurentBerger	3a53e726dd	example BLOB_MSER and fixed bug in blobdetector	2015-05-07 11:52:06 +02:00
laurentBerger	cfcef3ec98	File was not saved due to wrong file name. ... Add a comment about bug 4308	2015-05-06 19:55:16 +02:00
laurentBerger	171b58e2ca	Example BLOB_MSER	2015-05-06 16:50:22 +02:00
laurentBerger	6b9e273f92	Essai examleBlob et MSER	2015-05-05 12:06:16 +02:00
laurentBerger	09930938e8	Trailing white space first step	2015-05-04 10:59:43 +02:00
laurentBerger	09e9e8ad9f	I have modified source file and add a chart to have distance between keypoint for decriptor function og matching algorithm ... My english is not good so you can change some words in my comment	2015-05-04 10:36:24 +02:00
laurentBerger	9ddb8bdb8b	Problem with warning: comparison between signed and unsigned integer expressions	2015-05-03 14:08:24 +02:00
laurentBerger	56856a1810	Conversion size-t in int	2015-05-03 13:28:23 +02:00
laurentBerger	341de5d53f	trailing whitespace	2015-05-03 12:04:19 +02:00
laurentBerger	b28056e3dd	Trailing whitespace	2015-05-03 11:58:32 +02:00
laurentBerger	3e25c085ba	A sample program : how to use ORB AKAZE BRISK descriptors for matching. ... see http://answers.opencv.org/question/61062/features2d-example/	2015-05-03 11:42:27 +02:00
Vadim Pisarevsky	08848c56b7	Merge pull request #3965 from Dikay900:2_4_diff_to_master_2	2015-04-28 10:47:05 +00:00
Pierre Moulon	901d4995e3	Fix a typo error ... Fix a typo error Conflicts: modules/features2d/include/opencv2/features2d.hpp	2015-04-25 15:07:17 +02:00
Adi Shavit	aad95c7d8c	Added call to clone() to avoid unexpected change to external data. ... - Fix both stitching_detailed.cpp sample and cv::Stitcher.	2015-04-25 14:54:35 +02:00
Dikay900	d9b7b300b4	fix qt example on 2.4 with vs2010 and higher	2015-04-25 14:46:17 +02:00
Brian Park	044de4105e	add input paramter checking that verifies the existance of the input files to stero_match example ... remove the unnecessary header file check input paramter by checking the image size	2015-04-25 14:46:17 +02:00
Chris Mayo	7a5aa06b9e	Act on INSTALL_PYTHON_EXAMPLES ... Conflicts: samples/CMakeLists.txt	2015-04-25 14:46:16 +02:00
Ben Hagen	a21fb63c28	store user-provided data in PlaneTracker class	2015-04-25 11:22:18 +02:00
Yang Fan	eaa9b78121	ENH: explicitly declared outputFilename to surpress error C2668 ... Conflicts: samples/gpu/video_writer.cpp	2015-04-25 10:58:01 +02:00
ttagu99	a81374c1d7	findcontour_example check image empty	2015-04-24 21:58:31 +02:00
侯骥	66fc6126d2	Update MatchTemplate_Demo.cpp	2015-04-24 21:58:31 +02:00
Jay Bosamiya	8b58b59df4	Fix typo	2015-04-24 21:58:30 +02:00
RafaRuiz	f0595b8254	Update lkdemo.cpp because of memory leak ... In MacOSx x64 it was getting a memory leak even without initializing points: http://code.opencv.org/issues/4250	2015-04-24 21:58:29 +02:00
Pastafarianist	1e01441767	Fixed typo	2015-04-24 21:58:29 +02:00
Dikay900	c797746b6e	use constant instead of value backported from #785	2015-04-24 21:58:28 +02:00
Dikay900	1bf4427a5c	filename correction from #3217	2015-04-24 21:58:28 +02:00
Kevin Hughes	ac3ec0d96d	squashed #823 ... 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 Conflicts: modules/highgui/doc/reading_and_writing_images_and_video.rst samples/cpp/starter_video.cpp starter_video.cpp changed CV WINDOW KEEPRATIO to just WINDOW KEEPTATIO to fix build error starter_video.cpp hid local functions	2015-04-24 21:58:14 +02:00
Maximilien Cuony	5c6c537044	Fix typo in error for extrinsic parameters	2015-04-24 18:39:34 +02:00
Dikay900	f8c82fc214	update openni sample comments referring #81	2015-04-24 18:25:23 +02:00
Dikay900	9f7548ab89	update openni sample comments referring #81	2015-04-24 18:19:03 +02:00
Vadim Pisarevsky	8e493ef370	Merge pull request #3925 from ttagu99:findcontour_example2	2015-04-21 12:21:36 +00:00
Vadim Pisarevsky	887fe932cc	Merge pull request #3926 from stoneyang:stone	2015-04-21 12:20:42 +00:00
Maksim Shabunin	bb0631a365	Add sample cmake project	2015-04-16 17:33:38 +03:00
Yang Fan	3b177eaaa3	ENH: explicitly declared outputFilename to surpress error C2668	2015-04-14 13:39:14 +08:00
ttagu99	3c797b0ca5	findcontour_example check image empty	2015-04-14 10:01:53 +09:00
Maksim Shabunin	35b2139929	Basic HAL module	2015-04-07 18:16:22 +03:00
Vadim Pisarevsky	a035d39158	Merge pull request #3892 from MSOpenTech:imgcodecs-contrib	2015-04-02 11:53:55 +00:00
Vadim Pisarevsky	5ab26e3202	Merge pull request #3874 from paroj:calib_sample	2015-04-01 11:13:05 +00:00
Maxim Kostin	75850a1351	Added sample imgcodecs logic to winrt sample app ... - Made use imread() in OcvImageProcessing sample. - Added test/sample logic to verify file creation via imgcodecs. Signed-off-by: Maxim Kostin <v-maxkos@microsoft.com>	2015-03-31 17:09:09 +03:00
Pavel Rojtberg	7c5084e385	- update documentation ... * correct the part about fixed aspect * improve formatting * add snippet markers to source * replace inline code by @snippet - do not run calibration twice when using a imageList - make output consistent in itself (CamelCase vs no_camel_case) as well as with old camera calibrate sample - respect write extrinsic/ points flags - set the aspectRatio value when specified - fix writing of calibration settings. also update grammar. - fix intendation and remove some size_t -> int casts by using size_t	2015-03-31 15:45:57 +02:00
Vadim Pisarevsky	77cbddf715	Merge pull request #3847 from mshabunin:android-build	2015-03-26 16:56:49 +00:00
RafaRuiz	660a53e0e0	Update lkdemo.cpp because of memory leak ... In MacOSx x64 it was getting a memory leak even without initializing points: http://code.opencv.org/issues/4250	2015-03-24 09:06:55 +00:00
Maksim Shabunin	231685133e	OpenCV Manager: support 3.0.0 library	2015-03-19 15:27:14 +03:00
Maxim Kostin	349e3b546a	Fixed 'doc' builder warnings.	2015-03-18 17:44:49 +03:00
Maxim Kostin	5ec908c5f0	Added WinRT 8.1 Modern Desktop JavaScript sample	2015-03-18 16:31:27 +03:00
Vadim Pisarevsky	930808c22b	Merge pull request #3820 from LorenaGdL:patch-1	2015-03-13 13:20:09 +00:00
Alexander Alekhin	50b99e5aef	fix compilation on MSVS2010	2015-03-12 19:07:53 +03:00
LorenaGdL	b21b24fd8a	Update train_HOG.cpp ... Incorrect number of input arguments in main function	2015-03-11 14:18:07 +01:00
StevenPuttemans	3a7ea37090	extra camera specific information for IP settings	2015-03-10 10:16:13 +01:00
Vadim Pisarevsky	c9ea878d10	Merge pull request #3722 from berak:py_houghlines_sample	2015-03-03 18:16:25 +00:00
Maxim Kostin	ad1149ff12	Enabled property sheets for WinRT related samples	2015-03-02 22:26:46 +03:00
Maxim Kostin	530c8dc0c0	Fixing 'doc' buildbot job: removing trailing whitespaces and tab indents ... Signed-off-by: Maxim Kostin <v-maxkos@microsoft.com>	2015-03-02 22:26:45 +03:00
Maxim Kostin	213a6bc5c4	Adding Widows Phone 8 sample apps ... Signed-off-by: Maxim Kostin <v-maxkos@microsoft.com>	2015-03-02 22:26:45 +03:00
Maxim Kostin	59d6a281cd	Added WinRT Universal Apps samples ... Signed-off-by: Maxim Kostin <v-maxkos@microsoft.com>	2015-03-02 22:26:44 +03:00
Maxim Kostin	5810845777	Added and updated WinRT samples ... Signed-off-by: Maxim Kostin <v-maxkos@microsoft.com>	2015-03-02 22:26:44 +03:00
Vadim Pisarevsky	22ad72d08e	Merge pull request #3690 from theodr:moprh_lines_detection_tut	2015-03-02 11:36:15 +00:00
Vadim Pisarevsky	e9d30a9383	Merge pull request #3746 from theodr:pca_tutorial	2015-03-02 11:29:33 +00:00
theodore	79bc85fb09	Introduction to PCA tutorial	2015-02-26 15:53:03 +01:00
theodore	96c824f375	Morphology Lines Extraction Tutorial	2015-02-24 14:33:15 +01:00
berak	c83044d45a	fix houghlines.py sample and tutorial ... fix whitespace	2015-02-20 10:51:52 +01:00
Maksim Shabunin	79e8f0680c	Updated ml module interfaces and documentation	2015-02-17 11:46:14 +03:00
Maksim Shabunin	da383e65e2	Remove deprecated methods from cv::Algorithm	2015-02-16 15:28:54 +03:00
Maksim Shabunin	c85197da55	Fixed allocated vector size in ML ANN algorithm ... - updated return value of points_classifier sample	2015-02-03 18:16:20 +03:00
Vadim Pisarevsky	e64fb44f67	Merge pull request #3632 from theodr:dist_transf_tutorial	2015-02-02 10:10:39 +00:00
tt	4ea2eceb70	Image Segmentation .cpp tutorial ... Distance Transform tutorial fixes Distance Transform fixes v.2 Distance Transform fixes v.3 Distance Transform fixes v.4	2015-01-27 16:44:52 +01:00
Vladislav Vinogradov	124ac15f1e	remove cuda module	2015-01-22 15:02:21 +03:00
Vladislav Vinogradov	ce0e595a4f	move the rest cuda functions to cuda legacy	2015-01-22 15:02:21 +03:00
Vadim Pisarevsky	3f1fb281be	Merge pull request #3635 from jet47:cuda-optflow-refactoring	2015-01-22 09:45:19 +00:00
Vadim Pisarevsky	9c81338cb9	Merge pull request #3505 from karelknoest:lsd_subpixel	2015-01-22 09:44:29 +00:00
Vladislav Vinogradov	710617034b	remove unused function from pyrlk_optical_flow sample	2015-01-21 15:50:22 +03:00
Vladislav Vinogradov	63ff39f9f3	remove obsolete gpu optical flow samples	2015-01-21 15:50:22 +03:00
Vladislav Vinogradov	b3a743f09a	fix gpu samples compilation	2015-01-21 15:50:22 +03:00
Vadim Pisarevsky	479cac2a14	Merge pull request #3626 from jet47:cuda-bgsegm-refactoring	2015-01-21 10:40:47 +00:00
karelknoest	1ded2de2dd	Let LineSegmentDetector output line segment coordinates in float precision, as supported by the LSD algorithm.	2015-01-20 17:05:38 +01:00
StevenPuttemans	cf5a7b9679	remove an unused #endif	2015-01-20 15:41:39 +01:00
Vadim Pisarevsky	95ecdc3af9	Merge pull request #3600 from jet47:cuda-objdetect-module	2015-01-20 13:29:32 +00:00
Vadim Pisarevsky	f647054c8c	Merge pull request #3616 from marvins:gdal-fixes	2015-01-20 12:31:14 +00:00
Vadim Pisarevsky	696a6561d3	Merge pull request #3627 from cbenhagen:patch-1	2015-01-20 12:27:19 +00:00
Ben Hagen	5422cbcecb	make PlaneTracker class more thread-safe	2015-01-19 21:57:23 +01:00
Ben Hagen	3f8cefea0e	store user-provided data in PlaneTracker class	2015-01-19 21:51:19 +01:00
Vladislav Vinogradov	dae188d14f	move obsolete algorithms from cudabgsegm to cudalegacy: ... * GMG * FGD	2015-01-19 14:17:00 +03:00
Vadim Pisarevsky	381917b762	Merge pull request #3563 from cjmayo:pyexamples	2015-01-19 11:09:58 +00:00
Vadim Pisarevsky	5cc4aa0e93	Merge pull request #3554 from wangyan42164:match_template_mask	2015-01-19 11:03:44 +00:00
Vadim Pisarevsky	225c3e78cb	Merge pull request #3582 from ptzafrir:fix_samples	2015-01-19 10:53:42 +00:00
Vadim Pisarevsky	219d315c8d	Merge pull request #3615 from jaybosamiya:grabcuttypo	2015-01-19 10:50:52 +00:00
Vadim Pisarevsky	3a84444488	Merge pull request #3596 from jet47:cuda-features2d-refactoring	2015-01-19 10:48:18 +00:00
Alexander Smorkalov	911be68a41	Prevent native c/c++/ocl/gpu CMakeLists.txt install if samples are turned off.	2015-01-18 20:33:05 +03:00
Marvin Smith	91fbe00caa	Updated gdal tutorial to include comments.	2015-01-17 19:28:58 -08:00
Jay Bosamiya	10cc7c78dd	Fix typo	2015-01-17 22:53:30 +05:30
Yan Wang	46ed461e22	Add template match with mask. ... Signed-off-by: Yan Wang <yan.wang@linux.intel.com>	2015-01-16 11:09:26 +08:00
Vadim Pisarevsky	df57d038b8	Merge pull request #3572 from berak:python_samples_30	2015-01-15 13:17:26 +00:00
Tzafrir	997dded1ac	add default file to load in case sample was run without command line arguments	2015-01-15 14:10:31 +02:00
Alexander Smorkalov	187befd665	Fixed installation of CMakeLists.txt and enabled GPU samples build in stand alone version.	2015-01-15 14:48:24 +03:00
Vadim Pisarevsky	16b56e71d9	Merge pull request #3561 from jet47:cuda-arithm-refactoring	2015-01-15 11:44:35 +00:00
berak	fd60e98c5b	fixes for latest changes in opencv3.0 api ... fixes for latest changes in opencv3.0 api waitKey() normalization fixed mser bindings	2015-01-15 12:01:47 +01:00
Vladislav Vinogradov	734212a402	refactor CUDA CascadeClassifier	2015-01-14 19:50:05 +03:00
Vladislav Vinogradov	8257dc3c1e	refactor CUDA HOG algorithm: ... use abstract interface with hidden implementation	2015-01-14 19:50:05 +03:00
Vladislav Vinogradov	f126f371b2	move CUDA object detection algorithms to separate module	2015-01-14 19:50:05 +03:00
Vladislav Vinogradov	8a178da1a4	refactor CUDA BFMatcher algorithm: ... use new abstract interface and hidden implementation	2015-01-13 18:03:57 +03:00
Vladislav Vinogradov	f960a5707d	refactor CUDA ORB feature detector/extractor algorithm: ... use new abstract interface and hidden implementation	2015-01-13 18:03:57 +03:00
Vladislav Vinogradov	14ef62ed66	refactor CUDA FAST feature detector algorithm: ... use new FastFeatureDetector abstract interface and hidden implementation	2015-01-13 18:03:56 +03:00
Alexander Smorkalov	3425c90b66	GPU samples with NVIDIA specific API excluded from build if CUDA disabled.	2015-01-13 14:58:51 +03:00
Alexander Smorkalov	b0c5f49170	Build fixes for GPU samples.	2015-01-13 14:39:18 +03:00
Vadim Pisarevsky	2ecca8f59c	Merge pull request #3566 from jet47:cuda-imgproc-refactoring	2015-01-13 11:21:51 +00:00
Alexander Smorkalov	c0d76ef984	driver_api_stereo_multi sample reworked to use parallel_for_ instead of parallel_do	2015-01-13 13:00:06 +03:00
Alexander Smorkalov	72063bf136	parallel_do replaced with parallel_for_ in driver_gpu_multi sample.	2015-01-13 12:53:13 +03:00
Basheer Subei	fd1cae0dcc	typo fix in instructions of fitline.py sample	2015-01-05 00:09:00 +03:00
Alexander Smorkalov	091c7a3821	OpenGL interop sample reworked not ot use cvconfig.h	2015-01-04 23:52:00 +03:00
Vadim Pisarevsky	6cb93445e1	Merge pull request #3548 from alalek:fix_sample_python	2014-12-31 09:31:33 +00:00
Alexander Smorkalov	e02418e904	parallel_do replaced by parallel_for_ in gpu/multi.cpp sample to get rid of cvconfig.h	2014-12-30 16:44:33 +03:00
Alexander Smorkalov	840088e021	Get rid of cvconfig.h in Latent SVM samples. Use common OpenCV parallel framework instead of direct TBB calls.	2014-12-30 15:52:23 +03:00
Vladislav Vinogradov	220d937d9a	removed buffered versions of histogram functions ... used BufferPool mechanism instead	2014-12-30 15:37:45 +03:00
Chris Mayo	34f0da6010	Act on INSTALL_PYTHON_EXAMPLES	2014-12-30 10:13:10 +00:00
Vladislav Vinogradov	cd0e95de16	refactor cudaarithm reductions: ... * remove overloads with explicit buffer, now BufferPool is used * added async versions for all reduce functions	2014-12-30 11:06:33 +03:00
Maksim Shabunin	b4050c775e	Updated sample files documentation inclusions	2014-12-26 19:17:18 +03:00
Alexander Alekhin	63fc313d02	samples: fix python contants	2014-12-26 14:47:36 +03:00
Vladislav Vinogradov	53862687d5	rename CudaMem -> HostMem to better reflect its purpose	2014-12-23 17:42:49 +03:00
doltac	6cc5959356	Fixed typos in latentSVM detector demo.	2014-12-11 19:22:40 +09:00
Vadim Pisarevsky	46858c4328	Merge pull request #3463 from Dikay900:fix_sample_video_writer	2014-12-02 09:04:27 +00:00
Dikay900	44f629f99c	fix gpu sample performance test cpu part	2014-11-30 15:19:16 +01:00
Dikay900	8c919ed248	samples: gpu: fix include of TickMeter	2014-11-28 19:19:20 +01:00
Samyak Datta	a3f05474c9	C++ sample code to detect facial features	2014-11-12 23:35:02 +05:30
Vladislav Vinogradov	1189606cd8	fix gpu performance sample compilation	2014-11-12 18:07:20 +03:00
Alexander Alekhin	2e05f1e3f8	openni_capture sample: enable OpenNI2 if available ... Sample works with OpenNI2 with minimal code changes (CAP_OPENNI -> CAP_OPENNI2)	2014-11-08 02:22:29 +03:00
Vadim Pisarevsky	fe4e1913f0	Merge pull request #3357 from briansp2020:master	2014-11-07 12:02:53 +00:00
Brian Park	e4fa217a62	remove the unnecessary header file	2014-11-05 20:12:18 -08:00
Vadim Pisarevsky	c91b0e7ac4	Merge pull request #3217 from avdmitry:samples_cpp_data	2014-11-05 14:57:46 +00:00
Vadim Pisarevsky	d052d863eb	Merge pull request #3315 from abak:seamless-refactor	2014-11-05 10:41:32 +00:00
Brian Park	9e3a2cbab2	check input paramter by checking the image size	2014-11-03 21:38:15 -08:00
Brian Park	5de5f26223	Merge remote-tracking branch 'upstream/master'	2014-10-29 23:15:22 -07:00
StevenPuttemans	7dce2d0b8f	fixing cap_pvpapi interface and making sure both AVT Manta and Proscilla ... series are supported. Testing this with both cams for Windows and Linux exhaustively. Optimizing memory footprint by removing unused calls. Adapted with the input of Shai Added small example that illustrates how it should work.	2014-10-28 15:33:37 +01:00
Brian Park	f83a76cdeb	add input paramter checking that verifies the existance of the input files to stero_match example	2014-10-21 22:47:49 -07:00
Chuanbo Weng	2b52bb092a	Update hog.cpp ... Update according to vbystricky's comments	2014-10-20 18:14:38 +08:00
Chuanbo Weng	7452eef6e9	Correctly enable OpenCL mode in tapi's hog example. ... For current OpenCV-CL architecture, if the data buffer allocated in UMat are cpu buffer(not ocl buffer) under cpu mode, and then pass this UMat to an OpenCL kernel as an argument, the OpenCL path will fail and fallback to cpu mode. Take HOGDescriptor::oclSvmDetector as an example: ocl::setUseOpenCL(false); //data allocated in hog.oclSvmDetector will be cpu buffer hog.setSVMDetector(HOGDescriptor::getDaimlerPeopleDetector()); ocl::setUseOpenCL(true); //We enabled OpenCL, but hog.oclSvmDetector are cpu buffer, //so it will fail in the function ocl_classify_hists //when reach to this line //idx = k.set(idx, ocl::KernelArg::PtrReadOnly(detector)); hog.detectMultiScale(img, found, hit_threshold, win_stride, Size(0, 0), scale, gr_threshold); Similar problems heppen on img_aux and img. So we should re-define or re-set these UMat when do mode switch (CPU -> OpenCL) in order to make their data be allocated by ocl and then OpenCL path will succeed. Signed-off-by: Chuanbo Weng <chuanbo.weng@intel.com>	2014-10-20 11:50:46 +08:00
Vadim Pisarevsky	d2b9dc5530	quickly corrected the previous refactoring of features2d: moved from set(SOME_PROP, val) to setSomeProp(val)	2014-10-18 20:44:26 +04:00
Vadim Pisarevsky	1176d4ef84	fixed some more compile errors and test failures	2014-10-17 15:02:56 +04:00
Vadim Pisarevsky	d36b546df8	trying to fix strange compiler bug	2014-10-17 14:56:58 +04:00
Vadim Pisarevsky	06d4aa6060	now all the samples and opencv_contrib compile!	2014-10-17 14:56:58 +04:00
Adrien BAK	82a5ff8540	fix warnings in samples	2014-10-15 11:09:33 +09:00
Vadim Pisarevsky	263fd81bbc	Merge pull request #3245 from avdmitry:hello_opencv_sample	2014-10-09 14:56:13 +00:00
Dmitriy Anisimov	4c08581e48	opencv_version	2014-10-04 21:39:57 +04:00
Dmitriy Anisimov	71348651eb	fixed display_image tutorial sample	2014-09-23 07:45:52 +04:00
Dmitriy Anisimov	55c799a474	fixed warnings in documents	2014-09-23 07:45:52 +04:00
Dmitriy Anisimov	ec03d6e6fc	removed cpp/tutorial_code/images/	2014-09-23 07:45:52 +04:00
Dmitriy Anisimov	1007c06d44	initial commit	2014-09-23 07:45:51 +04:00
Maksim Shabunin	5e3e438edb	Fix xfeatures2d dependencies	2014-09-19 16:41:33 +04:00
Juan Carlos Niebles	dc49e11527	removed setter methods, replaced by CV_PROP_RW macro	2014-09-18 09:39:35 -05:00
Juan Carlos Niebles	1162f0ed63	fixed whitespaces	2014-09-17 19:02:12 -05:00
Juan Carlos Niebles	f610c88103	extended python interface for KalmanFilter	2014-09-17 18:45:48 -05:00
Vadim Pisarevsky	60a1cc34b8	Merge pull request #3231 from vpisarev:reenable_cpp_samples	2014-09-17 10:53:21 +00:00
Vadim Pisarevsky	aa4a80defc	the samples from the main repository should not depend on modules from opencv_contrib	2014-09-17 13:49:48 +04:00
Maximilien Cuony	9ac0b06ff1	Fix typo in error for extrinsic parameters	2014-09-17 09:32:19 +02:00
Vadim Pisarevsky	f8254a1011	Merge pull request #3200 from pierriko:master	2014-09-14 18:50:33 +00:00
Pierrick Koch	aeda3d2d69	[samples/pyhton] fix common {LINE->CV}_AA	2014-09-09 11:04:24 +02:00
Maksim Shabunin	c42424f2db	Fixed android samples build	2014-09-08 23:22:29 +04:00
John Kua	fb0c0eaa7c	Fixed bad non-ASCII character in how_to_scan_images.cpp which causes a compile error	2014-09-04 16:36:36 -07:00
Rok Mandeljc	d9db950c0e	samples: gpu: performance: SURF is now part of opencv_xfeatures2d	2014-08-30 01:01:08 +02:00
Rok Mandeljc	db391fdfdd	samples: gpu: performance: BackgroundSubtractorMOG is now part of opencv_bgsegm module	2014-08-30 01:01:08 +02:00
Rok Mandeljc	fbf28bcc63	samples: gpu: performance: fix include path for opencv_xfeatures2d ... As opencv_xfeatures2d is part of opencv-contrib and not opencv repository, ${OpenCV_SOURCE_DIR}/modules/modules/include is not a correct include path - use ${opencv_xfeatures2d_SOURCE_DIR}/include instead	2014-08-30 01:01:08 +02:00
Rok Mandeljc	653bca8b74	samples: gpu: super_resolution: disable simple optical flow ... The cv::superres::createOptFlow_Simple() function along with the simple optical flow class implementation is currently commented out in the superres module's code, so comment it out in the example as well.	2014-08-30 01:01:08 +02:00
Rok Mandeljc	f739990f4c	samples: gpu: performance: removed FGDStatModel performance comparison test ... The FGD background subtraction model was part of opencv_legacy module; as it is gone now, it makes little sense to benchmark the GPU version, either, so the whole test is removed.	2014-08-30 01:01:08 +02:00
Rok Mandeljc	51311779b3	samples: gpu: performance: remove inclusion of opencv2/legacy.hpp header ... The header is gone now, along with the opencv_legacy module.	2014-08-30 01:01:08 +02:00
Rok Mandeljc	e0c8721830	samples: gpu: removed inclusion of non-existent opencv2/contrib/contrib.hpp header, re-introduced TickMeter class in a separate header ... This patch removes inclusion of opencv2/contrib/contrib.hpp header, which does not exist anymore due to removal of opencv_contrib module. The samples including this header appear to be doing so in order to use TickMeter class; therefore, the latter is now provided by tick_meter.hpp header file, located in samples/gpu folder.	2014-08-30 01:01:08 +02:00
Rok Mandeljc	8908b22c9d	samples: gpu: removed softcascade example ... The example in question cannot be compiled anymore as the softcascade module has been removed in 3858f2291d.	2014-08-30 01:01:08 +02:00
StevenPuttemans	d27e440b2a	continue fixing nonfree elements ... fixed dependency of stitching module on xfeatures2d module as optional fixed the initModule_xfeatures2d function that was called in module stitching since it is in another namespace than the standard cv one.	2014-08-28 13:30:47 +02:00
StevenPuttemans	564a8ed208	adapted all nonfree header inclusion since it doesn't exist anymore as a module	2014-08-25 21:31:34 +02:00
Vadim Pisarevsky	b56933d9dc	Merge pull request #3131 from znah:python_namespaces	2014-08-22 07:12:31 +00:00
Alexander Mordvintsev	74c77d826f	base class name resolution ... fixed find_obj.py	2014-08-21 14:51:03 +04:00
Vadim Pisarevsky	b2cd954f24	Merge pull request #3042 from edgarriba:master	2014-08-20 13:18:37 +00:00
Vadim Pisarevsky	a223479107	Merge pull request #3099 from f-morozov:akaze_tutorial	2014-08-19 22:22:23 +00:00
f-morozov	886319c81d	AKAZE fixes and tracking tutorial	2014-08-19 16:35:20 +04:00
edgarriba	7e2bb63378	Merge branch 'master' of https://github.com/Itseez/opencv	2014-08-18 22:30:00 +02:00
Maksim Shabunin	108caae216	Modified logistic regression module according to comments ... - Reworked documentation to reflect actual code - Removed some unused variables - Removed unnecessary 'cv::' modifiers	2014-08-18 19:13:59 +04:00
Maksim Shabunin	4667e18831	Updated logistic regression example ... - Extracted common operations to separate functions. - Activated first parameters set. - Some output formatting. - Fixed loop break condition in mini_batch_gradient function.	2014-08-18 19:06:58 +04:00
Maksim Shabunin	3e26086f82	Reworked ML logistic regression implementation, initial version	2014-08-18 19:06:58 +04:00
Maksim Shabunin	71770eb790	Fixed ML module build after merge	2014-08-18 19:06:58 +04:00
Rahul Kavi	3cdd2b2761	updated logistic regression program with new api example	2014-08-18 19:06:52 +04:00
Rahul Kavi	b8ea21b2e5	updated logistic regression sample program	2014-08-18 19:06:48 +04:00
Rahul Kavi	7612e7af05	fixed trailing white-space in sample program for logistic regression	2014-08-18 19:06:48 +04:00
Rahul Kavi	3a6466d2e1	updated logistic regression sample program	2014-08-18 19:06:48 +04:00
Rahul Kavi	8355293306	added program to demonstrate use of logistic regression classifier	2014-08-18 19:06:36 +04:00
Rahul Kavi	62470d8a33	added sample data file to test logistic regression program	2014-08-18 19:06:36 +04:00
Vadim Pisarevsky	9a5aa4b23c	trying to solve compile problems; temporarily disabled some tests for just added optimization algo's	2014-08-14 14:37:30 +04:00
Vadim Pisarevsky	00b2124876	fixing more compile problems with Java bindings etc	2014-08-14 13:48:52 +04:00
Vadim Pisarevsky	a602185fb6	Merge pull request #3097 from mshabunin:gdal-support	2014-08-13 19:26:10 +00:00
mshabunin	3ed89a8879	Merge with master and fix conflicts	2014-08-13 18:24:11 +04:00
Adil Ibragimov	8a4a1bb018	Several type of formal refactoring: ... 1. someMatrix.data -> someMatrix.prt() 2. someMatrix.data + someMatrix.step * lineIndex -> someMatrix.ptr( lineIndex ) 3. (SomeType*) someMatrix.data -> someMatrix.ptr<SomeType>() 4. someMatrix.data -> !someMatrix.empty() ( or !someMatrix.data -> someMatrix.empty() ) in logical expressions	2014-08-13 15:21:35 +04:00
edgarriba	301ed34142	removed old headers	2014-08-12 17:36:23 +02:00
edgarriba	7da9800694	removed old headers	2014-08-12 17:22:35 +02:00
edgarriba	4a214c08e5	removed old code	2014-08-12 17:07:38 +02:00
edgarriba	1dec1645e5	Merge branch 'master' of https://github.com/Itseez/opencv	2014-08-12 16:45:22 +02:00
Vadim Pisarevsky	31df47b6ea	moved nonfree and a part of features2d to opencv_contrib/xfeatures2d	2014-08-11 23:26:39 +04:00
edgarriba	afdb67b462	SOLVEPNP_* flags	2014-08-11 16:28:09 +02:00
mshabunin	c54b8f9b00	Merge remote-tracking branch 'master' into stitch-fix ... * 'master' of github.com:itseez/opencv: (82 commits) moved part of video to contrib/{outflow, bgsegm}; moved matlab to contrib added some basic functionality needed by the new face module (moved from the old "contrib") moved to the new opencv_contrib/face module fixed various warnings and obvious errors reported by clang compiler and the coverity tool. Fixed review comment from Vadim Pisarevsky modified farneback sample to use T-API ECC patch by the author (G. Evangelidis); fixed some OCL Farneback optical flow test failures on Mac small fix for GaussianBlur ocl test fix binary package build small fix for ocl_resize fix IOS framework fixed test ocl_MatchTemplate for sparse matrix Fixed typos fixing error, wrong template method param. fixing Mac build some formal changes (generally adding constness) Fixed choice of kercn and rowsPerWI for non-Intel device. fixed nDiffs for CalcBackProject fixed tests for ocl_filter2d, ocl_matchTemplate, ocl_histogram.cpp Fixed issue: Mat::copyTo(UMat) if device copy is obsolete. Added test. ... Conflicts: modules/core/include/opencv2/core/mat.inl.hpp	2014-08-11 14:50:08 +04:00
Vadim Pisarevsky	07744af790	Merge pull request #3066 from vpisarev:minor_fixes	2014-08-11 10:27:30 +00:00
edgarriba	b7a19a9a5f	Removed Timer	2014-08-11 11:06:05 +02:00
edgarriba	c7f6c0cb9f	Fixed warnings + RANSAC confidence to double	2014-08-11 10:17:42 +02:00
Vadim Pisarevsky	d0137b6d2d	moved part of video to contrib/{outflow, bgsegm}; moved matlab to contrib	2014-08-10 23:24:16 +04:00
edgarriba	bc250c2e3f	bug fixed	2014-08-09 19:15:46 +02:00
edgarriba	80b4f99b1e	bug fixed	2014-08-09 18:16:44 +02:00
edgarriba	d09b404178	tutorial update	2014-08-09 17:32:52 +02:00
edgarriba	7ecad71ab0	fixed warnings	2014-08-09 17:18:47 +02:00
edgarriba	8c4b8cc0b4	fixed warnings	2014-08-09 17:14:24 +02:00
Vadim Pisarevsky	68305703bd	modified farneback sample to use T-API	2014-08-08 22:45:07 +04:00
edgarriba	3f5d3b2d40	video opening path modified	2014-08-08 15:36:27 +02:00
edgarriba	7d8a16ae39	remove unused tutorials	2014-08-08 14:45:43 +02:00
edgarriba	8b732e086d	updated ransanc model	2014-08-08 13:52:15 +02:00
edgarriba	c07cd007eb	Multi class tutorial compilation	2014-08-08 11:46:26 +02:00
edgarriba	8c08258cf2	moved headers	2014-08-07 13:06:24 +02:00
edgarriba	3a2cf37115	fixed conflicts	2014-08-07 12:41:47 +02:00
edgarriba	837f001789	update cmake	2014-08-07 11:55:17 +02:00
edgarriba	381574bdb7	Modified cmake	2014-08-07 11:33:32 +02:00
edgarriba	f1b6809eee	Updated Utils functions	2014-08-06 10:05:26 +02:00
edgarriba	2881f2a096	Fixed warnings	2014-08-06 09:21:38 +02:00
edgarriba	d2665b655e	Fixed warnings	2014-08-06 08:41:14 +02:00
edgarriba	e14f91dd37	Update headers	2014-08-06 08:18:11 +02:00
edgarriba	ddf5c86f3a	Added code	2014-08-06 08:12:55 +02:00
edgarriba	57d2cb8962	deleted: src/CsvReader.cpp ... deleted: src/CsvReader.h deleted: src/CsvWriter.cpp deleted: src/CsvWriter.h deleted: src/Mesh.cpp deleted: src/Mesh.h deleted: src/Model.cpp deleted: src/Model.h deleted: src/ModelRegistration.cpp deleted: src/ModelRegistration.h deleted: src/PnPProblem.cpp deleted: src/PnPProblem.h deleted: src/RobustMatcher.cpp deleted: src/RobustMatcher.h deleted: src/Utils.cpp deleted: src/Utils.h deleted: src/main_detection.cpp deleted: src/main_registration.cpp deleted: src/main_verification.cpp deleted: src/test_pnp.cpp	2014-08-06 08:11:03 +02:00
edgarriba	43301096d3	Update tutorial	2014-08-05 20:06:47 +02:00
Alexander Alekhin	55188fe991	world fix	2014-08-05 20:12:35 +04:00
edgarriba	7b0be9cf8f	Update code	2014-08-05 17:27:20 +02:00
edgarriba	0d2bc9b0a1	Removed whitespaces	2014-08-05 17:02:06 +02:00
edgarriba	55819ae464	Tutorial code restructure	2014-08-05 15:48:54 +02:00
edgarriba	23785faf02	Update for NON BOOST libraries	2014-08-05 14:47:06 +02:00
edgarriba	16e750dd37	Update for Boost libraries	2014-08-05 14:02:23 +02:00
edgarriba	1727e0acf6	Update for Boost libraries	2014-08-05 14:00:23 +02:00
edgarriba	dfa3ccdea9	Update for Boost libraries	2014-08-05 13:43:01 +02:00
edgarriba	a3e74ec521	Merge remote-tracking branch 'upstream/master' ... Conflicts: modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst	2014-08-05 12:59:47 +02:00
Vadim Pisarevsky	432b7cb235	Merge pull request #3032 from vpisarev:refactor_ml2	2014-08-04 14:51:38 +00:00
Vadim Pisarevsky	cb9b88e65b	fixed more compile warnings on Windows	2014-08-04 14:22:31 +04:00
Vadim Pisarevsky	c20ff6ce19	made everything compile and even run somehow	2014-08-03 01:41:09 +04:00
Roman Donchenko	983e75e5de	Merge remote-tracking branch 'origin/master' into merge-2.4	2014-08-01 15:01:41 +04:00
Vadim Pisarevsky	05164bf713	Merge pull request #2608 from Siddharthk:master	2014-08-01 09:13:32 +00:00
Vadim Pisarevsky	10b60f8d16	continuing refactoring ml samples; added "max vote" response to ANN_MLP. Probably, should make it in less hacky way	2014-07-31 14:12:10 +04:00
Vadim Pisarevsky	223cdcd0ee	fixed compilation of some samples; fixed ANN_MLP::predict	2014-07-30 22:53:46 +04:00
Vadim Pisarevsky	2ab7fb6051	Merge pull request #3017 from f-morozov:akaze	2014-07-30 15:03:47 +00:00
f-morozov	7f82960897	AKAZE fixes, tests and tutorial	2014-07-30 18:02:08 +04:00
edgarriba	85ccac2633	Added help()	2014-07-30 15:23:52 +02:00
edgarriba	4a86900761	Added help()	2014-07-30 13:32:27 +02:00
edgarriba	69f1ee8732	Code tutorial	2014-07-30 13:08:19 +02:00
edgarriba	6ff58f02e2	Code tutorial	2014-07-30 12:57:18 +02:00
edgarriba	94968c81e0	Code tutorial	2014-07-30 12:57:11 +02:00
edgarriba	b58979d057	Code tutorial	2014-07-30 12:57:04 +02:00
edgarriba	38c2cc8521	Code tutorial	2014-07-30 12:56:55 +02:00
edgarriba	31bec45998	Code tutorial	2014-07-30 12:56:46 +02:00
edgarriba	b33a2f24fa	Code tutorial	2014-07-30 12:56:30 +02:00
edgarriba	9d18f5c458	Code tutorial	2014-07-30 12:56:22 +02:00
edgarriba	6f5876f8f7	Code tutorial	2014-07-30 12:55:35 +02:00
edgarriba	2848f43acc	Code tutorial	2014-07-30 12:54:49 +02:00
edgarriba	319dbd2eb7	Code tutorial	2014-07-30 12:53:43 +02:00
edgarriba	924e062426	Code tutorial	2014-07-30 12:53:24 +02:00
edgarriba	3b24aa2441	Code tutorial	2014-07-30 12:53:14 +02:00
edgarriba	be4c1afb0b	Code tutorial	2014-07-30 12:53:06 +02:00
edgarriba	550e3721ae	Code tutorial	2014-07-30 12:51:59 +02:00
edgarriba	64c164c111	Code tutorial	2014-07-30 12:39:46 +02:00
edgarriba	74e52df3cd	Code tutorial	2014-07-30 12:33:27 +02:00
edgarriba	7334e54a63	Code tutorial	2014-07-30 12:31:19 +02:00
siddharth	88d05a89d4	removed build error ... Whitespaces removed	2014-07-29 00:15:11 +05:30
siddharth	14d0b763ec	changed demo tutorial path	2014-07-29 00:15:11 +05:30
Vadim Pisarevsky	1ad9827fc4	removed ERFilter (to be moved to opencv_contrib/modules/text) and lineMOD (to be moved to opencv_contrib/modules/rgbd)	2014-07-28 16:48:53 +04:00
Vadim Pisarevsky	ee90b88dd7	Merge pull request #2720 from pglotov:master	2014-07-25 12:54:22 +00:00
vbystricky	fd51c133df	Add depends from highgui to imgcodecs and videoio. And include header from imgcodecs and videoio to imgcodecs	2014-07-21 15:10:41 +04:00
Vadim Pisarevsky	8f8450793a	Merge pull request #2964 from vbystricky:highgui_split	2014-07-16 19:29:36 +00:00
Petr Glotov	7a77cf584a	added timelapse	2014-07-15 09:32:47 -07:00
Vadim Pisarevsky	cf3757448d	Merge pull request #2965 from soulslicer:patch-2	2014-07-15 09:44:32 +00:00
Vadim Pisarevsky	b1793e2fb9	Merge pull request #2939 from adishavit:sample-fix_stitching_pipeline	2014-07-15 08:09:04 +00:00
vbystricky	d58f736935	Split highgui module to videoio and highgui	2014-07-14 23:16:47 +04:00
Andrey Pavlenko	64d8cf1e2e	improving face-rec sample: ... * CSV can contain dir-s and wildcards * save trained model	2014-07-12 19:28:43 +04:00
Marvin Smith	67e23ed972	Fixing double to uchar conversion warning.	2014-07-11 07:33:42 -07:00
Raaj	6e022dcb06	Update facedetect.cpp ... Somebody forgot to add curly brackets	2014-07-10 17:44:40 -07:00
Roman Donchenko	a3bde36c84	Merge remote-tracking branch 'origin/2.4' into merge-2.4 ... Conflicts: modules/calib3d/include/opencv2/calib3d/calib3d.hpp modules/contrib/doc/facerec/facerec_api.rst modules/contrib/include/opencv2/contrib/contrib.hpp modules/contrib/src/facerec.cpp modules/core/include/opencv2/core/mat.hpp modules/features2d/include/opencv2/features2d/features2d.hpp modules/highgui/src/loadsave.cpp modules/imgproc/src/pyramids.cpp modules/ocl/include/opencv2/ocl/cl_runtime/cl_runtime.hpp modules/python/src2/gen.py modules/python/test/test.py modules/superres/test/test_superres.cpp samples/cpp/facerec_demo.cpp	2014-07-08 14:33:56 +04:00
vbystricky	4286f60387	Extract imgcodecs module from highgui	2014-07-07 16:28:08 +04:00
Adi Shavit	7674f3ddbf	Added call to clone() to avoid unexpected change to external data. ... - Fix both stitching_detailed.cpp sample and cv::Stitcher.	2014-07-03 22:14:58 +03:00
Marvin Smith	561703ca27	Fixed the compiler warnings for the demo program.	2014-07-01 17:04:28 -07:00
Marvin Smith	14548227ca	Adding support for GDAL raster images.	2014-07-01 16:29:11 -07:00
Roman Donchenko	e8850bf84a	Merge pull request #2626 from KayKwon:matlab_formatter	2014-06-26 17:40:26 +04:00
Vadim Pisarevsky	07c0d50edf	put the detection-based tracker back (to objdetect module), so that the Android face detection sample builds fine. The patch by Konstantin Matskevich that adds C++11 threads support has been merged in too. Also, fixed compile error in the doc builder.	2014-06-24 21:16:09 +04:00
Vadim Pisarevsky	3858f2291d	removed contrib, legacy and softcsscade modules; removed latentsvm and datamatrix detector from objdetect. removed haartraining and sft apps. ... some of the stuff will be moved to opencv_contrib module. in order to make this PR pass buildbot, please, comment off opencv_legacy, opencv_contrib and opencv_softcascade test runs.	2014-06-24 19:18:51 +04:00
Neo Alienson	b6e25a9fc7	Fix typos	2014-06-16 18:48:10 +08:00
侯骥	055adc2302	Update MatchTemplate_Demo.cpp	2014-06-11 10:29:30 +02:00
Roman Donchenko	1f4ddbe5b6	Merge pull request #2705 from KonstantinMatskevich:face_recognition_labels_info	2014-06-10 12:24:56 +04:00
Alexander Alekhin	15b6fd2ec4	android: allow to build & run examples without Android OpenCV Manager	2014-06-06 18:01:04 +04:00
Konstantin Matskevich	8d4a76925c	fixed binary compatibility	2014-05-21 09:25:15 +04:00
Roman Donchenko	3d7a457c97	Merge remote-tracking branch 'origin/2.4' into merge-2.4 ... Conflicts: doc/tutorials/introduction/linux_install/linux_install.rst modules/core/doc/operations_on_arrays.rst modules/core/include/opencv2/core/core.hpp modules/core/src/system.cpp modules/gpu/src/cuda/resize.cu modules/imgproc/doc/miscellaneous_transformations.rst modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst modules/video/src/bgfg_gaussmix2.cpp	2014-05-19 18:39:20 +04:00
Vladislav Vinogradov	55a714c83b	fix cv::kmeans function ... reshape input matrix, since the function works with data as with [N x dims] matrix	2014-05-13 18:00:17 +04:00
Konstantin Matskevich	aa76ef9a98	fixes	2014-05-08 15:55:55 +04:00
Konstantin Matskevich	36afd4ef55	added additionalInfo in faceRecognition	2014-05-07 16:29:55 +04:00
KayKwon	e13e3be16e	Merge branch 'master' into matlab_formatter	2014-04-16 11:13:02 +09:00
KayKwon	84257b57d0	Fix for (Bug #2789) ... Add MatlabFormatter for matlab style output. See http://code.opencv.org/issues/2789	2014-04-16 10:56:27 +09:00
Alexander Alekhin	c1ea6f3c42	TAPI: stitching: improve warpers	2014-04-11 13:01:07 +04:00
Alexander Alekhin	1d9808e5d5	TAPI: stitching, replaced Mat->UMat/_Array	2014-04-11 13:01:06 +04:00
Alexander Alekhin	03773cb117	remove ippasync samples from build without IPP-A	2014-04-09 18:58:53 +04:00
Andrey Pavlenko	9ec823d800	Merge pull request #2538 from ElenaGvozdeva:ipp_async_convert	2014-04-08 11:05:30 +04:00
Elena Gvozdeva	f9c5289483	fixed	2014-04-07 18:53:07 +04:00
Elena Gvozdeva	037ac27ec8	Added SharedMatrix	2014-04-03 14:53:27 +04:00
Elena Gvozdeva	fa2d79a15b	Added IPP Async converters, doc and sample	2014-04-01 16:47:29 +04:00
Roman Donchenko	f77c68e0fa	Merge remote-tracking branch 'origin/2.4' into merge-2.4 ... Conflicts: modules/imgproc/src/opencl/integral_sqrsum.cl modules/nonfree/doc/feature_detection.rst modules/nonfree/include/opencv2/nonfree/ocl.hpp modules/nonfree/src/surf_ocl.cpp modules/nonfree/test/test_features2d.cpp modules/ocl/doc/image_processing.rst modules/ocl/include/opencv2/ocl/ocl.hpp modules/ocl/perf/perf_imgproc.cpp modules/ocl/perf/perf_match_template.cpp modules/ocl/src/haar.cpp modules/ocl/src/imgproc.cpp modules/ocl/src/match_template.cpp modules/ocl/src/opencl/haarobjectdetect.cl modules/ocl/src/opencl/haarobjectdetect_scaled2.cl modules/ocl/test/test_imgproc.cpp	2014-03-31 14:42:00 +04:00
Martin Jul	73042b32e1	Fixed typos in "matching"	2014-03-26 23:29:48 +01:00
Roman Donchenko	cc05493730	Merge remote-tracking branch 'origin/2.4' into merge-2.4 ... Conflicts: cmake/OpenCVDetectAndroidSDK.cmake cmake/OpenCVGenAndroidMK.cmake cmake/OpenCVModule.cmake cmake/templates/OpenCV.mk.in cmake/templates/OpenCVConfig.cmake.in doc/tutorials/imgproc/histograms/histogram_comparison/histogram_comparison.rst modules/cudabgsegm/src/cuda/mog.cu modules/imgproc/perf/opencl/perf_filters.cpp modules/imgproc/src/opencl/filterSep_singlePass.cl modules/nonfree/CMakeLists.txt modules/nonfree/perf/perf_precomp.hpp modules/ocl/perf/perf_haar.cpp modules/ocl/src/filtering.cpp modules/ocl/src/opencl/bgfg_mog.cl modules/superres/CMakeLists.txt modules/superres/src/btv_l1_cuda.cpp modules/superres/src/cuda/btv_l1_gpu.cu modules/superres/src/frame_source.cpp modules/superres/src/input_array_utility.cpp modules/superres/src/optical_flow.cpp modules/superres/src/precomp.hpp samples/gpu/CMakeLists.txt samples/gpu/brox_optical_flow.cpp samples/gpu/super_resolution.cpp	2014-03-24 19:02:16 +04:00
Roman Donchenko	a1e5bd71f1	Merge pull request #2446 from asmorkalov:ocv_implicit_cuda_control	2014-03-19 14:49:22 +04:00
Alexander Smorkalov	b4e4f13f9e	Superres module enabled for Android. GPU samples build fixed for Android.	2014-03-18 17:07:19 +04:00
Roman Donchenko	a489d86e5f	Merge pull request #2460 from berak:b_3598_24	2014-03-17 15:52:56 +04:00
berak	5f94a205d1	fixed h / s ranges in histogram_calculation tutorial ... literalinclude literalinclude, dropped :lines:	2014-03-17 11:01:02 +01:00
Roman Donchenko	95a55453df	Merge remote-tracking branch 'origin/2.4' into merge-2.4 ... Conflicts: modules/calib3d/perf/perf_pnp.cpp modules/contrib/src/imagelogpolprojection.cpp modules/contrib/src/templatebuffer.hpp modules/core/perf/opencl/perf_gemm.cpp modules/cudafeatures2d/doc/feature_detection_and_description.rst modules/cudafeatures2d/perf/perf_features2d.cpp modules/cudafeatures2d/src/fast.cpp modules/cudafeatures2d/test/test_features2d.cpp modules/features2d/doc/feature_detection_and_description.rst modules/features2d/include/opencv2/features2d/features2d.hpp modules/features2d/perf/opencl/perf_brute_force_matcher.cpp modules/gpu/include/opencv2/gpu/gpu.hpp modules/gpu/perf/perf_imgproc.cpp modules/gpu/perf4au/main.cpp modules/imgproc/perf/opencl/perf_blend.cpp modules/imgproc/perf/opencl/perf_color.cpp modules/imgproc/perf/opencl/perf_moments.cpp modules/imgproc/perf/opencl/perf_pyramid.cpp modules/objdetect/perf/opencl/perf_hogdetect.cpp modules/ocl/perf/perf_arithm.cpp modules/ocl/perf/perf_bgfg.cpp modules/ocl/perf/perf_blend.cpp modules/ocl/perf/perf_brute_force_matcher.cpp modules/ocl/perf/perf_canny.cpp modules/ocl/perf/perf_filters.cpp modules/ocl/perf/perf_gftt.cpp modules/ocl/perf/perf_haar.cpp modules/ocl/perf/perf_imgproc.cpp modules/ocl/perf/perf_imgwarp.cpp modules/ocl/perf/perf_match_template.cpp modules/ocl/perf/perf_matrix_operation.cpp modules/ocl/perf/perf_ml.cpp modules/ocl/perf/perf_moments.cpp modules/ocl/perf/perf_opticalflow.cpp modules/ocl/perf/perf_precomp.hpp modules/ocl/src/cl_context.cpp modules/ocl/src/opencl/haarobjectdetect.cl modules/video/src/lkpyramid.cpp modules/video/src/precomp.hpp samples/gpu/morphology.cpp	2014-03-11 17:20:01 +04:00
Ilya Lavrenov	099ea91823	typos	2014-03-04 12:47:40 +04:00
Roman Donchenko	db85c35e69	Merge remote-tracking branch 'origin/2.4' into merge-2.4 ... Conflicts: modules/contrib/src/basicretinafilter.hpp modules/contrib/src/magnoretinafilter.hpp modules/contrib/src/parvoretinafilter.hpp modules/contrib/src/retinacolor.hpp modules/gpu/include/opencv2/gpu/gpu.hpp modules/highgui/src/cap_tyzx.cpp modules/ocl/perf/perf_filters.cpp modules/ocl/src/haar.cpp modules/ocl/src/opencl/haarobjectdetect.cl modules/ocl/test/test_filters.cpp modules/ocl/test/test_objdetect.cpp	2014-03-03 13:45:22 +04:00
Roman Donchenko	af8aa8a2fa	Merge pull request #2433 from ilya-lavrenov:typos	2014-03-03 12:20:35 +04:00
Ilya Lavrenov	eedf86402d	typos	2014-03-02 21:04:17 +04:00
Arun JVS	31fb7c4fec	Fixed Bug #3568: Build fails with WITH_OPENGL=ON	2014-02-25 14:34:32 +05:30
Roman Donchenko	029ffb7c2d	Merge remote-tracking branch 'origin/2.4' into merge-2.4 ... Conflicts: modules/core/src/gl_core_3_1.cpp modules/core/src/opencl/convert.cl modules/cudaimgproc/src/cuda/canny.cu modules/cudastereo/perf/perf_stereo.cpp modules/gpu/perf/perf_imgproc.cpp modules/gpu/test/test_denoising.cpp modules/ocl/src/opencl/imgproc_resize.cl samples/cpp/Qt_sample/main.cpp	2014-02-17 15:24:05 +04:00
Roman Donchenko	a0bb74a086	Merge pull request #2337 from pmoulon:master	2014-02-17 12:24:48 +04:00
Pierre Moulon	f3f8b843b6	Fix a typo error	2014-02-14 12:21:35 +01:00
Roman Donchenko	a1de9e9ad5	Merge pull request #2329 from ilya-lavrenov:macosx_ogl	2014-02-14 14:38:37 +04:00
Roman Donchenko	88f993dbda	Deleted an assignment to a variable that doesn't exist.	2014-02-14 14:37:56 +04:00
Ilya Lavrenov	b92a46c130	some more fixes	2014-02-13 23:47:18 +04:00
Alexander Smorkalov	7da3e98dfd	Application pause/resume fix for Android sample NativeActivity.	2014-02-13 16:47:02 +04:00
Ilya Lavrenov	879c0196d4	enabled OpenGL on MacOSX	2014-02-13 00:17:15 +04:00
Sven Wehner	f7041bacc0	grabcut.py sample: Allow drawing rect from bottom/right ... The grabcut sample script isn't able to create rectangles correctly that are drawn from e.g. bottom-right to top-left. This small commit uses four min() calls to determine the correct top-left point of the rectangle. It also removes some unnecessary white spaces before colons.	2014-02-10 16:53:17 +01:00
Alexander Smorkalov	6ae4a9b09b	Multiple improvements in OpenCV examples build. ... EMBED_CUDA and FORCE_EMBED_OPENCV flags added to cmake macro add_android_project; INSTALL_CUDA_LIBRARIES option added to OpenCV.mk opencv_dynamicuda library installation with enabled OPENCV_INSTALL_MODULES flag fixed; CUDA initialization apportunity added to OpenCVLoader.initDebug(); Tutorial-4-CUDA sample reimplemented with static OpenCV and CUDA initialization.	2014-02-06 15:32:57 +04:00
Roman Donchenko	721d0145e0	Merge pull request #2002 from abak:stereo_calibrate	2014-02-05 17:47:27 +04:00
Ilya Lavrenov	2e8579fe9b	cleaned up super_resolution sample from old OCL	2014-02-05 00:28:10 +04:00
Ilya Lavrenov	c7fe162829	renamed **2 -> **	2014-02-04 19:55:11 +04:00
Andrey Pavlenko	92c8b94ba9	Merge pull request #2265 from vpisarev:ocl_facedetect_amd3	2014-02-04 00:39:09 +04:00
Vadim Pisarevsky	b8c6adc569	Merge pull request #2178 from Nerei:viz_backport	2014-02-03 16:16:51 +04:00
Roman Donchenko	652a0bd5ce	Merge pull request #2262 from SpecLad:merge-2.4	2014-02-03 15:33:41 +04:00
Vadim Pisarevsky	30593ee55e	3rd attempt to prepare patch with improved OpenCL kernels of CascadeClassifier.	2014-02-03 15:12:27 +04:00
Roman Donchenko	2bbda9d225	Merge remote-tracking branch 'origin/2.4' into merge-2.4 ... Conflicts: modules/cudaimgproc/test/test_color.cpp modules/dynamicuda/include/opencv2/dynamicuda/dynamicuda.hpp modules/gpu/perf/perf_imgproc.cpp modules/gpu/src/imgproc.cpp modules/gpu/test/test_core.cpp modules/gpu/test/test_imgproc.cpp modules/java/generator/src/cpp/VideoCapture.cpp samples/gpu/performance/CMakeLists.txt samples/tapi/CMakeLists.txt	2014-02-03 13:23:59 +04:00
Vladislav Vinogradov	214cbabc40	update stitching sample	2014-02-03 12:55:03 +04:00
Ilya Lavrenov	f8dd9960af	one more ocl deletion	2014-02-01 21:50:14 +04:00
Ilya Lavrenov	0f168936a0	OCL module 2 trash	2014-01-31 13:19:16 +04:00
Roman Donchenko	afa62c4161	Merge pull request #2212 from SpecLad:hog-sample-const-mat	2014-01-29 17:20:25 +04:00
Alexander Smorkalov	39201e68e2	Code review notes fixed. ... Env setup for testing package implemented using /etc/profile.d; Variable with path for all native samples added; Path for test binaries and test data updated.	2014-01-27 18:47:09 +04:00
Roman Donchenko	6a511755b2	Fixed build for samples/cpp/train_HOG.cpp. ... get_hogdescriptor_visu is passed img->clone(), which is not usable as a non-const reference (and it doesn't modify the argument, anyway).	2014-01-27 17:39:33 +04:00
Alexander Smorkalov	f332cba14b	OpenCV C/C++/OCL/CUDA samples install path fixed. Install rools for tests added.	2014-01-27 15:49:24 +04:00
Roman Donchenko	bbc35d609d	Merge remote-tracking branch 'origin/2.4' into merge-2.4 ... Conflicts: cmake/OpenCVDetectPython.cmake cmake/OpenCVModule.cmake modules/core/src/gpumat.cpp modules/cudaimgproc/test/test_hough.cpp modules/gpu/CMakeLists.txt modules/gpu/src/cuda/generalized_hough.cu modules/gpu/src/generalized_hough.cpp modules/python/CMakeLists.txt	2014-01-27 15:28:14 +04:00
Konstantin Matskevich	07778e1760	fixes	2014-01-24 13:37:19 +04:00
Konstantin Matskevich	450ea3131f	samples	2014-01-24 12:59:19 +04:00
Andrey Pavlenko	1400f53436	Merge pull request #2184 from ilya-lavrenov:bioinspired2contrib	2014-01-21 23:27:16 +04:00
Alexander Smorkalov	b75cbfde45	All installed files marked with component names for install customization.	2014-01-21 20:34:36 +04:00
Andrey Pavlenko	c8afe7efc6	Merge pull request #1320 from mbarnach:svm_hog	2014-01-21 19:23:04 +04:00
Ilya Lavrenov	5d206059a8	moved bioinspired to opencv_contrib	2014-01-21 18:02:53 +04:00
Anatoly Baksheev	130914d9f4	fixed documentation warnings	2014-01-21 02:15:37 +04:00
Roman Donchenko	fee2ed37fc	Merge remote-tracking branch 'origin/2.4' into merge-2.4 ... Conflicts: modules/contrib/src/retina.cpp modules/core/include/opencv2/core/mat.hpp modules/core/src/algorithm.cpp modules/core/src/arithm.cpp modules/features2d/src/features2d_init.cpp modules/gpu/include/opencv2/gpu/gpu.hpp modules/gpu/perf/perf_imgproc.cpp modules/imgproc/src/generalized_hough.cpp modules/ocl/include/opencv2/ocl/ocl.hpp modules/video/src/tvl1flow.cpp modules/video/src/video_init.cpp	2014-01-14 11:53:59 +04:00
Ilya Lavrenov	118709fd9f	added OpenCL accelerated warpers	2014-01-10 18:16:56 +04:00
Roman Donchenko	a13e32f5ab	Merge pull request #2115 from nghiaho12:kmeans_sample	2014-01-09 16:58:29 +04:00
Nghia Ho	bf4994554d	Removed unecessary initialisation of Mat centers.	2014-01-09 21:04:17 +11:00
Ilya Lavrenov	6b9ebcbf3d	deleted extra semicolons	2014-01-07 02:52:30 +04:00
Nghia Ho	601b7d1dd3	Fixed a valgrind 'Conditional jump or move depends on uninitialised value(s)' on cv::kmeans(...). The original code used points(sampleCount, 1, CV_32FC2), which confused generateCentersPP into thinking it is a 1 dimensional center, instead of 2. As a result it would set only the x variable and leave y unitialised.	2014-01-06 20:19:07 +11:00
Ilya Lavrenov	c4c913ff13	converted CPU-based example to T-API (Mat 2 UMat, etc)	2013-12-30 03:19:17 +04:00
Ilya Lavrenov	63e4af8536	added the first T-API example - CamShift tracking	2013-12-29 14:36:59 +04:00
Alexander Smorkalov	cea9a97434	CUDA support check added.	2013-12-26 14:52:41 +04:00
Alexander Smorkalov	b3eee49451	New sample for CUDA on Android added.	2013-12-26 14:52:41 +04:00
Roman Donchenko	3c4b24d531	Merge remote-tracking branch 'origin/2.4' into merge-2.4 ... Conflicts: CMakeLists.txt modules/highgui/src/cap.cpp modules/nonfree/src/surf.ocl.cpp modules/ocl/include/opencv2/ocl/ocl.hpp modules/ocl/src/color.cpp modules/ocl/src/gftt.cpp modules/ocl/src/imgproc.cpp samples/ocl/facedetect.cpp	2013-12-23 18:50:17 +04:00
Roman Donchenko	f22d9a232d	Merge pull request #2022 from asmorkalov:ocv_dynamic_cuda	2013-12-23 12:45:49 +04:00
Roman Donchenko	6e22be4100	Merge pull request #2003 from vbystricky:intelperc_camera_2.4	2013-12-20 17:06:27 +04:00
Roman Donchenko	b633c73c46	Merge pull request #1994 from StevenPuttemans:bugfix_3431	2013-12-20 11:57:30 +04:00
Alexander Smorkalov	529bd41751	Build fixes for case where HAVE_CUDA==OFF.	2013-12-20 11:37:15 +04:00
Vadim Pisarevsky	a1784b7320	converted old haar cascades to the new format; added the conversion function; added OpenCL optimization into CascadeClassfier; optimized the data structures and CPU code for the stump case.	2013-12-19 14:48:42 +04:00
Vadim Pisarevsky	ec3f22cee2	renamed OpenCL kernel filename; made some final changes	2013-12-19 14:29:28 +04:00
Andrey Pavlenko	8c60498673	adding timing for multi-threaded case	2013-12-18 17:02:39 +04:00
Vladimir Bystricky	dd71bef6f5	Fix errors in example (samples/cpp/intelperc_capture.cpp)	2013-12-18 09:59:24 +04:00
Andrey Pavlenko	e719bee2b8	minor refactoring, no functional changes	2013-12-18 00:15:02 +04:00
Vladimir Bystricky	63ae0eeba5	Fix build errors	2013-12-17 18:39:52 +04:00
Andrey Pavlenko	bd91b39593	Merge pull request #1917 from alalek:ocl_d3d	2013-12-17 16:44:27 +04:00
Vladimir Bystricky	cc08e00876	Fix notes about cmake files. Fix build warning.	2013-12-17 16:13:55 +04:00
Roman Donchenko	e49b8dee40	Merge pull request #1881 from pentschev:defaultNorm_master	2013-12-17 13:53:59 +04:00
Roman Donchenko	52a785e95a	Merge pull request #1996 from SpecLad:merge-2.4	2013-12-17 13:21:48 +04:00
Vladimir Bystricky	4088013251	Add set/get depth generator properties by default. Add documentation	2013-12-17 12:00:40 +04:00
Adrien BAK	c5c3fd4443	modify signature of stereoCalibrate for consistency	2013-12-17 14:53:44 +09:00
Roman Donchenko	9d8d70d6ca	Merge remote-tracking branch 'origin/2.4' into merge-2.4 ... Conflicts: doc/tutorials/definitions/tocDefinitions.rst modules/core/include/opencv2/core/core.hpp modules/core/src/system.cpp modules/features2d/src/freak.cpp modules/ocl/include/opencv2/ocl/ocl.hpp modules/ocl/src/cl_context.cpp modules/ocl/test/test_api.cpp	2013-12-16 15:02:12 +04:00
StevenPuttemans	12c25b9310	Fixed suggestion of bugfix 3431 ... Seems correct to me and builds fine	2013-12-16 11:05:53 +01:00
StevenPuttemans	e4b41d38f1	Fixed descripotorsCount to descriptorsCount ... See feature 2862	2013-12-16 10:47:24 +01:00
Alexander Alekhin	11b9d5bf4d	core: added DirectX interop implementation (OpenCL) with samples	2013-12-13 19:02:41 +04:00
Vladimir Bystricky	e8d2a9752b	Add support Creative Senz3D camera by Intel Perceptual Computing SDK	2013-12-13 17:25:16 +04:00
Mimmmo Cosenza	f07e9e7c5f	add clojure sample	2013-12-11 13:26:47 +01:00
Ilya Lavrenov	1015c5c24d	fixed facedetect sample	2013-12-11 15:08:49 +04:00
Vadim Pisarevsky	302a5adcc2	converted Haar cascades to the new format; now they are handled with C++ code.	2013-12-10 22:54:37 +04:00
Roman Donchenko	464a010f53	Merge remote-tracking branch 'origin/2.4' into merge-2.4 ... Conflicts: modules/core/include/opencv2/core/operations.hpp modules/core/include/opencv2/core/version.hpp modules/core/src/gpumat.cpp modules/cudaimgproc/src/color.cpp modules/features2d/src/orb.cpp modules/imgproc/src/samplers.cpp modules/ocl/include/opencv2/ocl/matrix_operations.hpp modules/ocl/include/opencv2/ocl/ocl.hpp samples/ocl/facedetect.cpp	2013-12-10 12:51:00 +04:00