Commit Graph

2952 Commits

Author SHA1 Message Date
Alexander Alekhin
d0e02cccba samples(dnn): avoid 'async' keyword (Python 3.7+) 2020-01-23 18:43:36 +03:00
Gourav Roy
a6359e49d2 Added tutorial for text skewness correction in C++ and Python. 2020-01-23 08:24:39 +03:00
Liubov Batanina
832ca0734d Refactoring 2020-01-22 10:52:40 +03:00
Liubov Batanina
bb91e6999b Fix demo 2020-01-20 10:22:01 +03:00
Hannes Achleitner
3b54ebec3f fix lint errors and warnings ins Android samples
backporting of commit 4057e81b76
2020-01-17 14:14:36 +03:00
Alexander Alekhin
4cc458eb10 Merge pull request #16335 from berak:fix_ml_python_digits_samples_3.4 2020-01-13 12:16:40 +00:00
berak
a718f2e6ea ml/python: fix digits samples(3.4) 2020-01-13 12:26:28 +01:00
Gourav Roy
38e6d668b1 Merge pull request #16276 from themechanicalcoder:video-tutorial
* Added java code for meanshift and optical_flow

* added java code for module video

* added appropriate spaces in codes

* converted absolute path to command line arguments

* added spaces at appropriate places
2020-01-12 11:34:59 +03:00
ihsan314
2c21ea2dd7 Merge pull request #14666 from ihsan314:file_io_xml_yml
Python code examples for file IO in xml and yml format

* Initial "Pythonization" of file_input_output.cpp

* Moved file_input_output.py to correct location

* Nearly done Pythonizing file_input_output.cpp

* Python equivalent of file_input_output.py created

* Started Pythonizing camera_calibration.cpp

* Completed Python tutorial/sample code for file_input_output

* Resolved whitespace issues

* Removed tabs in file_input_output.cpp

* Patched import order and wrapped code in main function

* Changed string to docstring format in help file

* Updated link to Python example code
2020-01-12 11:32:12 +03:00
Liubov Batanina
ea31a14cc5 Update sample 2020-01-10 16:33:17 +03:00
Alexander Alekhin
7b28d5b409 Merge pull request #16263 from dkurt:dnn_tf_addv2 2019-12-30 22:56:11 +00:00
Dmitry Kurtaev
76cfa65d55 AddV2 from TensorFlow 2019-12-30 20:06:58 +03:00
Jed
ef290366b0 Removed deprecated 'clock' import. 2019-12-30 13:00:29 +00:00
Alexander Alekhin
9572895da0 Merge pull request #16237 from alalek:eliminate_build_warnings 2019-12-27 19:38:25 +00:00
Brian Wignall
f9c514b391 Fix spelling typos
backport commit 659ffaddb4
2019-12-27 12:46:53 +00:00
Alexander Alekhin
d064079a4e build: eliminate build warnings 2019-12-25 23:28:24 +00:00
Liubov Batanina
ffa72fc979 Refactoring 2019-12-24 09:45:27 +03:00
Liubov Batanina
6e33769e56 Add human parsing demo 2019-12-23 15:47:20 +03:00
Tatsuro Shibamura
971ae00942 Merge pull request #16027 from shibayan:arm64-windows10
* Support ARM64 Windows 10 platform

* Fixed detection issue for ARM64 Windows 10

* Try enabling ARM NEON intrin

* build: disable NEON with MSVC compiler

* samples(directx): gdi32 dependency
2019-12-17 00:23:30 +03:00
Alexander Alekhin
a45928045a
Merge pull request #16150 from alalek:cmake_avoid_deprecated_link_private
* cmake: avoid deprecated LINK_PRIVATE/LINK_PUBLIC

see CMP0023 (CMake 2.8.12+)

* cmake: fix 3rdparty list

- don't include OpenCV modules
2019-12-13 17:52:40 +03:00
Alexander Alekhin
15612ebd39 python: enable Python 3.8 2019-12-11 16:52:38 +03:00
Alexander Alekhin
f21bde4d9f
Merge pull request #16046 from alalek:issue_15990
* core: disable invalid constructors in C API by default

- C API objects will lose their default initializers through constructors

* samples: stop using of C API
2019-12-05 14:48:18 +03:00
Dmitry Kurtaev
6e14cc2189 Resolve https://github.com/opencv/opencv/issues/15863 2019-11-24 21:59:25 +03:00
Lorenzo Lucignano
c40fbad12e Samples DNN: tf_text_graph_sd.py loads box coder variance and box NMS params from config file 2019-11-20 10:45:57 +01:00
CJ Smith
c2f2ea6b85 Merge pull request #15789 from CJSmith-0141:15779-scale-bug-in-stereo-match-sample
* Changes disparity image to float representation

Signed-off-by: Connor James Smith <cjs.connor.smith@gmail.com>

* samples: update disparity multiplier handling in stereo_match.cpp
2019-10-31 22:29:04 +03:00
float13
1accf3b3f4 Tutorial - Make required input args positional.
I think it would help to change all 3 of the the input file arguments to be "positional" for consistency with the other tutorials. This also simplifies the command line input to run this tutorial by reducing typing, and helpfully prints the "usage" info if any of the 3 required inputs are missing.

I'm new to OpenCV and working through the tutorials. I kept getting runtime errors with this one until I realized that the arguments weren't positional, and I was missing the "--input1", "--input2, "--input3" flags preceding the filenames. All of the previous tutorials had required filenames as positional arguments and didn't require this.

The original code would require each input to be specified like this:
./compareHist_Demo --input1 filename1 --input2 filename2 --input3 filename3 

But with this change, the above command is simplified to:
./compareHist_Demo  filename1 filename2 filename3

This avoids a confusing runtime error to make things simpler for newcomers like me :)
2019-10-23 13:07:52 +03:00
nick black
6e9eca29e2
stitching_detailed: use correct match_conf default
The usage function states that the default for match_conf is
0.65 if the default SURF feature finder is used, and 0.3 for
orbs. Indeed, if --feature orbs is used, match_conf is set
to 0.3f. This is a NOP, because the real default is also set
to 0.3f. Change it to 0.65f when SURF is in play.
2019-10-22 08:03:46 -04:00
Steve Nicholson
acb3b3bd4d Add documentation and example program for intersectConvexConvex 2019-10-19 22:08:07 -07:00
Alexander Alekhin
0e40c8a031 fix pylint warnings
pylint 1.8.3
2019-10-16 18:49:33 +03:00
Alexander Alekhin
8167d47efc Merge pull request #15516 from dkurt:dnn_detection_model_fix_3.4 2019-09-18 11:22:27 +00:00
Dmitry Kurtaev
741aee6901 Fix dnn object detection sample 2019-09-13 11:50:50 +03:00
Suleyman TURKMEN
f73395122c Update Samples 2019-09-05 01:10:51 +03:00
craterkamath
04f720d56a Fixed Typo Closes #15148 2019-08-19 22:52:00 +05:30
luz.paz
57ccf14952 FIx misc. source and comment typos
Found via `codespell -q 3 -S ./3rdparty,./modules -L amin,ang,atleast,dof,endwhile,hist,uint`

backporting of commit: 32aba5e64b
2019-08-15 13:09:52 +03:00
Alexander Alekhin
b584c23061 Merge pull request #15158 from dkurt:fix_tf_ssd_configs 2019-08-02 16:08:55 +00:00
Maksim Shabunin
5ef7325874 Merge pull request #15176 from dkurt:fix_14993 2019-07-30 14:26:33 +00:00
Maksim Shabunin
e90438fe3c Merge pull request #14938 from LaurentBerger:face_clip 2019-07-30 14:18:51 +00:00
Dmitry Kurtaev
59864a3bbc Fix #14993 2019-07-28 22:32:37 +03:00
Dmitry Kurtaev
47c5ee5d9c Fixes for OpenCV face detection network 2019-07-27 17:25:09 +02:00
Dmitry Kurtaev
a0c3bb70a9 Modify SSD from TensorFlow graph generation script to enable MyriadX 2019-07-26 13:57:08 +03:00
Alexander Alekhin
39a6889767 Merge pull request #15118 from dkurt:fix_15106 2019-07-25 18:56:32 +00:00
Dmitry Kurtaev
a2125594ea Fix false positives of face detection network for large faces 2019-07-25 20:09:59 +03:00
Alexander Alekhin
8bac8b513c core: support SIMD intrinsics in user code 2019-07-19 20:33:32 +00:00
Alexander Alekhin
b00e19a8da Merge pull request #14837 from Cartucho:fix_laplace_operator_on_python 2019-07-01 17:00:25 +00:00
LaurentBerger
97681d0607 Add clip to deploy.prototxt 2019-06-30 18:39:05 +02:00
Dmitry Kurtaev
a04ab2298b Fix JS sample of dnn 2019-06-29 19:21:14 +03:00
Dmitry Kurtaev
411ca87a86
Remove extra ")" 2019-06-26 17:27:56 +03:00
Alexander Alekhin
8fd87033ef Merge pull request #14869 from alalek:samples_msvs2019_support 2019-06-25 22:07:02 +00:00
Dmitry Kurtaev
d17d3b66aa Fix face recognition JS sample 2019-06-24 16:41:37 +03:00
tribta
e8283f94ed Fix Python code, for the tutorial_laplace_operator, to get the same result between the Cpp, Java and Python 2019-06-23 18:03:01 +01:00
Alexander Alekhin
5c63be3c6e samples: support MSVS 2019 compiler
requires CMake 3.14+
2019-06-22 16:24:21 +00:00
Dmitry Kurtaev
d75a089690 Fix face recognition sample for JS 2019-06-21 21:53:52 -07:00
wenzhao
3f5c85e933 opencv.js: fix the loading issue of opencv.js(WASM) in face recognition 2019-06-13 11:26:27 +08:00
Alexander Alekhin
6d916c5bb4 Merge pull request #14440 from alalek:async_array 2019-06-08 20:57:15 +00:00
Alexander Alekhin
8fae361768 Merge pull request #14750 from alalek:sample_fix_encoding 2019-06-07 11:12:28 +00:00
SchultzC
1e6e18ff05
Changed to integer division 2019-06-06 14:50:45 -07:00
Alexander Alekhin
a51d46cbf9 samples: skip findFile() in encoding mode 2019-06-06 20:42:55 +00:00
SchultzC
3833d86f0f Merge pull request #14733 from SchultzC:3.4
* cast positional arguments to int

* Changed to integer division based

* removed white space

* removed white space
2019-06-06 13:02:45 +03:00
Ahmed Ashour
1aca1d582e Fix some typos 2019-06-05 12:24:13 +02:00
SchultzC
edb3337ead Remove divide by 1000
because t = (time.time() - t) will return seconds,  dividing by 1000 to obtain seconds will be incorrect.
2019-06-04 08:17:37 -07:00
Lubov Batanina
f94253b82b Merge pull request #14627 from l-bat:demo_kinetics
* Support 3D ResNet-34-kinetics

* Update sample

* Remove preprocess

* Change test

* Fix sample
2019-05-30 17:36:00 +03:00
Dmitry Kurtaev
26e426adb1 StridedSlice from TensorFlow 2019-05-22 12:45:52 +03:00
Alexander Alekhin
132253c9f3 dnn: use AsyncArray 2019-05-18 19:32:23 +00:00
Alexander Alekhin
18151e79bb cmake(samples): use LINK_PRIVATE in target_link_libraries 2019-05-15 18:38:00 +03:00
mehlukas
6bff0e24f8 Merge pull request #14314 from mehlukas:3.4-opticalflow
Extend optical flow tutorial (#14314)

* extend python optical flow tutorial with cpp example code and add it to general tutorial directory

* remove unused parameters, fix comparison between signed and unsigned int

* fix hsv range problem

* switch to samples::findFile for sample file location

* switch to command line parameter for path

* remove old tutorial as in 14393

* minor fixes
2019-05-15 15:13:57 +03:00
mehlukas
47c45e5bd3 Merge pull request #14393 from mehlukas:3.4-meanshift
Extend meanshift tutorial (#14393)

* copy original tutorial and python code

* add cpp code, fix python code

* add camshift cpp code, fix bug in meanshift code

* add description to ToC page

* fix shadowing previous local declaration

* fix grammar: with -> within

* docs: remove content of old py_meanshift tutorial, add link

* docs: replace meanshift tutorial subpage in Python tutorials

* switch to ref to fix wrong breadcrumb navigation

* switch to cmdline for path as in #14314

* Apply suggestions from code review

* order programming languages alphabetically
2019-05-15 13:34:20 +03:00
Alexander Alekhin
9fabc3406f Merge pull request #14558 from alalek:cmake_samples_threading_3.4 2019-05-14 19:02:23 +00:00
Dmitry Kurtaev
63bb97cc19 Asynchronous C++ sample 2019-05-14 19:09:07 +03:00
Alexander Alekhin
3201ea89d6 cmake: enable threading in samples
- moved code into separate file due issue with handling of CMake policies
2019-05-14 17:29:46 +03:00
Dmitry Kurtaev
c3b0a68a2b Async mode for dnn's object detection sample 2019-05-14 09:58:47 +03:00
LaurentBerger
fa8e301c69 extends regex matching for conv group of layers 2019-05-07 16:17:25 +02:00
Sheel-Patel
ec39f0dc9e Merge pull request #14122 from Sheel-Patel:patch-1
Grammatical errors for help() in detect_mser.cpp (#14122)

* Grammatical errors for help() statement

Corrected spelling of "synthetic" and added grammatical clarification for keys to press to change view or use mouse.

* Adjustment of superfluous spaces
2019-04-24 01:45:27 +03:00
Alexander Alekhin
e98222dfb3 Merge pull request #14260 from allanrodriguez:sample-digits-cpp 2019-04-23 22:38:07 +00:00
Dmitry Kurtaev
a304069687 Remove preprocessing parameters from README 2019-04-16 13:29:33 +03:00
Allan Rodriguez
86561fef90 Added C++ version of digits.py. 2019-04-13 22:29:30 -07:00
Alexander Alekhin
d38869eb76 docs: fix links
- replace tutorial links via docs.opencv.org
- remove link on OpenCV 2.4
- avoid links on outdated packages
2019-04-04 18:57:22 +03:00
Alexander Alekhin
6686559c70 ocl: define CL_SILENCE_DEPRECATION on MacOSX 2019-03-26 13:11:53 +03:00
Pedro Ferreira da Costa
9cef78b685 Merge pull request #14109 from PedroFerreiradaCosta:adding_python_version_to_anisotropic_tutorial
* Created python version of the code for the anisotropic image segmentation tutorial. Created python/cpp toggles for the markdown file.

* fix doxygen warnings
2019-03-21 22:53:12 +03:00
Alexander Alekhin
04fad57fc1 samples: fix python samples compatibility with demo.py 2019-03-20 18:32:34 +03:00
Alexander Alekhin
3ba49ccecc imgproc: removed LSD code due original code license conflict 2019-03-01 16:25:39 +03:00
Alexander Alekhin
5fd47352cf Merge pull request #13904 from cftang0827:dnn_tf_text_graph_common_bug 2019-02-27 16:32:40 +00:00
cftang
98d8436440 fix tf_text_graph_common tensor_content type bug 2019-02-26 01:20:54 +08:00
Dmitry Kurtaev
fe7c93cc05 Fix priors boxes generation in case of non square inputs for TensorFlow SSDs 2019-02-25 12:43:42 +03:00
catree
3c92d40f6e Fix arguments parsing. Add possibility to choose between different features type. Add keypoints matching visualization. Auto format code. 2019-02-18 14:15:44 +01:00
Dmitry Kurtaev
6ad3bf3130 Enable ResNet-based Mask-RCNN models from TensorFlow Object Detection API 2019-02-06 13:05:11 +03:00
Alexander Alekhin
f46cd9dbf5 Merge pull request #13670 from allnes:dnn_fix_obj_detect_sample 2019-02-05 12:37:53 +00:00
Dmitry Kurtaev
252fd63194 Align TensorFlow and OpenCV paths to create a text graph 2019-01-31 13:40:54 +03:00
Alexander Nesterov
cca2c4b314 Update obj. detect sample 2019-01-30 16:44:42 -01:00
Dmitry Kurtaev
67e6a6077d Create text graphs for Faster-RCNN from TensorFlow with dilated convolutions 2019-01-18 18:46:52 +03:00
Alexander Alekhin
bbc6b95c02 Merge pull request #13644 from berak:dnn_samples_googlenet 2019-01-17 12:34:53 +00:00
berak
6596eab66c dnn/samples: add googlenet to model zoo 2019-01-17 12:14:35 +01:00
Alexander Alekhin
6e39856623 Merge pull request #13614 from dkurt:dnn_tf_ssd_fpn 2019-01-13 09:33:05 +00:00
Dmitry Kurtaev
4ae5df5509 SSD with FPN proposals from TensorFlow 2019-01-11 12:20:03 +03:00
Dmitry Kurtaev
62199df815 Fix edge_detection.py sample for Python 3 2019-01-09 15:28:10 +03:00
Alexander Nesterov
a208c3bf04 Fix openpose samples 2018-12-25 14:12:44 -01:00
vishwesh5
715f8fcce0 Merge pull request #13432 from vishwesh5:patch-1
* Create text_detection.py

#12270 #13429
**Deep Learning text detection sample (Python)**
- Tested on **Ubuntu 18.04** - OpenCV 3.4.3, OpenCV 3.4.4, OpenCV 4.0 (master branch)
- Python version supported - Python 2 and Python 3

* Fix trailing whitespaces

* Update text_detection.py

* Remove whitespace

* Remove comments

* Remove unused packages

* Update description
2018-12-18 13:40:04 +03:00
Alexander Alekhin
742f22c09b photo: move TonemapDurand to opencv_contrib 2018-12-04 18:59:27 +03:00
Alexander Alekhin
94d7c0f7f5 Merge pull request #13144 from dkurt:update_tf_mask_rcnn 2018-11-19 15:55:35 +00:00
Alexander Alekhin
73a17baeec samples(run_python): fix registry values querying 2018-11-17 09:42:51 +00:00
Alexander Alekhin
43002c0c1d
Merge pull request #13188 from alalek:samples_rename
* samples: rename starter_imagelist.cpp

* samples: rename intelperc_capture.cpp => videocapture_intelperc.cpp

* samples: rename openni_capture.cpp => videocapture_openni.cpp

* samples: rename image_sequence.cpp => videocapture_image_sequence.cpp

* samples: rename gstreamer_pipeline.cpp => videocapture_gstreamer_pipeline.cpp

* samples: rename autofocus.cpp => videocapture_gphoto2_autofocus.cpp

* samples: rename live_detect_qrcode.cpp => qrcode.cpp
2018-11-17 00:35:05 +03:00