Vadim Pisarevsky
828b0b151b
another attempt to fix compile errors
2013-12-04 22:22:36 +04:00
Vadim Pisarevsky
fe11ca886a
trying to eliminate compile problems
2013-12-04 21:56:35 +04:00
Vadim Pisarevsky
ff87385201
refactored CascadeClassifier to hide implementation details (take 2)
2013-12-04 19:00:39 +04:00
Vadim Pisarevsky
d914f20a4c
updated patch to bring in the first functions with "transparent API"
2013-11-18 11:48:00 -05:00
lluis
047b568f6d
erGrouping now uses a classifier for group validation instead of a set of heuristical ifos.
...
Updated documentation and sample to use the new function API
2013-09-27 19:19:45 +02:00
lluis
2837bfd9fa
Added erGrouping function: Find groups of Extremal Regions that are organized as text blocks. Updated sample/cpp to use the complete text detection pipeline
2013-09-19 10:30:25 +02:00
lluis
d25309f82e
first parameter of createERFilterNM1/createERFilterNM2 is now mandatory. changed the sample program to use the new prototypes
2013-09-13 16:29:21 +02:00
lluis
75fdfba281
renamed getDefaultClassifierNM{1,2}() to loadClassifierNM{1,2}() and added "const std::string& filename" parameter (mandatory).
2013-09-13 16:19:52 +02:00
lluis
95d92c099c
functions getDefaultClassifierNM1() and getDefaultClassifierNM2() allow to implicitly load the default classifiers when creating a ERFilter object
2013-09-13 12:54:23 +02:00
lluis
e8d3732aaf
added computeNMChannels helper function to compute the diferent channels to be processed independently in the N&M algorithm.
2013-09-09 11:37:58 +02:00
lluis
cd33ca0009
changed default parameters in CreateERFiltersNM{1,2} functions. They are not needed now in the sample example.
2013-09-06 19:10:53 +02:00
lluis
6ef1d456dd
fixed rebase conflicts
2013-09-06 14:00:11 +02:00
lluis
765921cc25
fixed a typo error in the default min_Probability param of CreateERFilterNM2
2013-09-06 12:30:22 +02:00
Roman Donchenko
b12894d95a
Boring changes - objdetect.
2013-09-05 19:02:58 +04:00
Roman Donchenko
9ed475cf52
War on Whitespace, master edition: file endings.
2013-08-27 14:23:26 +04:00
Roman Donchenko
9b92545ce6
War on Whitespace, master edition: trailing spaces.
2013-08-27 13:57:24 +04:00
Roman Donchenko
dcaf923517
Merge remote-tracking branch 'origin/2.4'
...
Conflicts:
3rdparty/ffmpeg/ffmpeg_version.cmake
cmake/OpenCVFindLibsGrfmt.cmake
cmake/templates/cvconfig.h.cmake
modules/bioinspired/doc/retina/index.rst
modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
modules/calib3d/src/precomp.hpp
modules/contrib/src/inputoutput.cpp
modules/contrib/src/precomp.hpp
modules/core/include/opencv2/core/internal.hpp
modules/core/include/opencv2/core/types_c.h
modules/core/src/drawing.cpp
modules/core/src/precomp.hpp
modules/core/src/system.cpp
modules/features2d/doc/common_interfaces_of_descriptor_matchers.rst
modules/features2d/doc/common_interfaces_of_feature_detectors.rst
modules/features2d/include/opencv2/features2d/features2d.hpp
modules/features2d/src/precomp.hpp
modules/flann/src/precomp.hpp
modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
modules/gpu/doc/image_filtering.rst
modules/gpu/doc/image_processing.rst
modules/gpu/doc/video.rst
modules/gpu/perf/perf_imgproc.cpp
modules/gpu/perf4au/main.cpp
modules/gpu/src/imgproc.cpp
modules/gpu/src/precomp.hpp
modules/gpu/test/test_imgproc.cpp
modules/highgui/CMakeLists.txt
modules/highgui/test/test_precomp.hpp
modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
modules/imgproc/src/precomp.hpp
modules/java/generator/src/cpp/Mat.cpp
modules/legacy/src/precomp.hpp
modules/ml/doc/k_nearest_neighbors.rst
modules/ml/src/precomp.hpp
modules/nonfree/doc/feature_detection.rst
modules/nonfree/src/precomp.hpp
modules/objdetect/include/opencv2/objdetect/objdetect.hpp
modules/objdetect/src/cascadedetect.cpp
modules/objdetect/src/hog.cpp
modules/objdetect/src/precomp.hpp
modules/objdetect/test/test_latentsvmdetector.cpp
modules/ocl/src/hog.cpp
modules/ocl/src/opencl/objdetect_hog.cl
modules/ocl/src/precomp.hpp
modules/photo/src/precomp.hpp
modules/stitching/src/precomp.hpp
modules/superres/perf/perf_precomp.hpp
modules/superres/src/optical_flow.cpp
modules/superres/src/precomp.hpp
modules/superres/test/test_precomp.hpp
modules/ts/include/opencv2/ts.hpp
modules/video/src/precomp.hpp
modules/videostab/src/precomp.hpp
modules/world/src/precomp.hpp
2013-08-06 13:56:49 +04:00
Roman Donchenko
8afb7a40c6
Merge pull request #1159 from lluisgomez:scene_text_detection_NM
2013-07-25 12:13:49 +04:00
lluis
c4f88b0687
removed some unnecessary ERStat members as they are easily computable from others
2013-07-23 15:04:01 +02:00
lluis
43e7e6e475
removed extra cv:: scope qualifiers for better readability
2013-07-23 14:37:45 +02:00
lluis
2087d4602b
using Rect for storing the bounding box instead of an integer array
2013-07-23 13:58:52 +02:00
lluis
ca6b30a568
using explicit keyword in the ERStat constructor for safe contruction
2013-07-23 00:24:17 +02:00
lluis
5abe3b59f5
Class-specific Extremal Region Filter algorithm as proposed in :
...
Neumann L., Matas J.: Real-Time Scene Text Localization and Recognition, CVPR 2012.
High-level C++ interface and implementation of algorithm is in the objdetect module.
C++ example, a test image, and the default classifiers in xml files.
2013-07-20 01:10:05 +02:00
Peter Minin
7d70399d72
Add a new variant of detectMultiScale with output arguments 'objects' and 'numDetections'; factor most of detectMultiScale's code into 2 protected methods
2013-06-14 04:25:17 +04:00
Bahram Dahi
dcad6ce65a
Reverted back to the previous method where a public method groupRectangles was added to HOGDescriptor to take care of ROI and weight grouping
2013-05-24 18:25:23 -04:00
Andrey Kamaev
5e048d1fa5
Move C API of opencv_objdetect to separate file
...
Also move cv::linemod to own header
2013-04-12 14:37:01 +04:00
jackculpepper
297e6d0b73
mark multiple return arguments for python bindings
2013-04-04 00:51:52 -07:00
Andrey Kamaev
2b1ef95415
Completely separate C and C++ API of OpenCV core
2013-04-01 15:24:34 +04:00
Andrey Kamaev
be7bbe3aa9
Drop cv:: prefix from cv::String used inside the cv namespace
2013-03-22 22:14:50 +04:00
Andrey Kamaev
2ad7b97f1c
All modules (except ocl and gpu) compiles and pass tests
2013-03-22 22:14:26 +04:00
Andrey Kamaev
a42a0f5fca
Added compatibility headers
2013-03-13 17:26:56 +04:00
Andrey Kamaev
ad5cddc007
Main module headers are moved 1 level up
...
e.g. <opencv2/core/core.hpp> become <opencv2/core.hpp>
Also renamed <opencv2/core/opengl_interop.hpp> to <opencv2/core/opengl.hpp>
2013-03-13 17:26:56 +04:00
Andrey Kamaev
2a6fb2867e
Remove all using directives for STL namespace and members
...
Made all STL usages explicit to be able automatically find all usages of
particular class or function.
2013-02-25 15:04:17 +04:00
marina.kolpakova
1b43b0e2df
move soft cascade functionality into dedicated module
2013-02-01 14:36:05 +04:00
marina.kolpakova
a28f5a89b3
move preprocessor to objdetect
2013-02-01 14:35:27 +04:00
marina.kolpakova
cb329400df
fix tests
2013-01-30 15:55:04 +04:00
marina.kolpakova
8d9c9c2690
integrate new cascade format to GPU soft cascade implementation
2013-01-30 15:55:04 +04:00
marina.kolpakova
53433884ee
fix python wrapping
2013-01-18 15:58:48 +04:00
marina.kolpakova
2d45af790e
fix according to pull requests comments
2012-12-12 05:07:39 +04:00
marina.kolpakova
88c71d1b7d
add NMS according to Dollar's paper.
2012-12-12 04:31:44 +04:00
marina.kolpakova
bd9ca48fab
export to python/java
2012-11-13 02:49:35 +04:00
marina.kolpakova
8a3e897999
min and max params become double
2012-11-08 02:34:49 +04:00
marina.kolpakova
e379771c03
git warning
2012-11-08 02:34:49 +04:00
marina.kolpakova
4656872161
fixed typo
2012-11-08 02:34:49 +04:00
marina.kolpakova
157ab66ab9
add ROI support
2012-11-08 02:34:49 +04:00
marina.kolpakova
6a3a723938
refactor integral channels
2012-11-08 02:34:48 +04:00
marina.kolpakova
4a1c4a9862
soft cascade become Algorithm
2012-11-08 02:34:48 +04:00
marina.kolpakova
a84334cfc2
brief soft cascade interface description
2012-11-07 03:19:07 +04:00
marina.kolpakova
2e8ed77383
get rid of hard-coded values
2012-11-07 03:19:07 +04:00
marina.kolpakova
16dd09ccfc
move scale related parameters to SoftCascade constructor
2012-11-07 03:19:07 +04:00
marina.kolpakova
017d970b9a
load SoftCascade from FileStorage
2012-11-07 03:19:06 +04:00
marina.kolpakova
3d41846c39
move frame processing into separate class
2012-11-07 03:19:06 +04:00
marina.kolpakova
5651743784
remove debug imshow from code
2012-11-07 03:19:06 +04:00
marina.kolpakova
8e092f8b5d
add Detection struct to interface
2012-11-07 03:19:06 +04:00
marina.kolpakova
2d2c46e717
add const qualifier to detectMultiScale method
2012-11-07 03:19:06 +04:00
marina.kolpakova
765dea9ddf
fix bugs in the soft cascade detect method; add options for debug logging
...
- WITH_DEBUG_OUT for logging cascade scales
- DEBUG_STORE_IMAGES for xml matrix serialization
- DEBUG_SHOW_RESULT to see detection result
2012-11-07 03:19:05 +04:00
marina.kolpakova
dc74ce20ab
OpenCV friendly xml format for soft cascade
2012-11-07 03:19:04 +04:00
marina.kolpakova
c04725b681
add apply cascade method
2012-11-07 03:19:04 +04:00
marina.kolpakova
695827050f
Integral images for ICF
2012-11-07 03:19:04 +04:00
marina.kolpakova
b0b85f36f6
add test for soft cascade detect method
2012-11-07 03:19:04 +04:00
marina.kolpakova
a54d456ad0
parse soft cascade from xml
2012-11-07 03:19:04 +04:00
marina.kolpakova
fe2c38be80
add method to fill soft cascade
2012-11-07 03:19:04 +04:00
marina.kolpakova
fb113e5ce4
scale pyramid calculations
2012-11-07 03:19:04 +04:00
marina.kolpakova
9966d7feba
add structures for cascade representation
2012-11-07 03:19:04 +04:00
marina.kolpakova
108fd169f7
dummy soft cascade
2012-11-07 03:19:03 +04:00
OpenCV Buildbot
81f826db2b
Normalize line endings and whitespace
2012-10-17 15:57:49 +04:00
OpenCV Buildbot
04384a71e4
Normalize line endings and whitespace
2012-10-17 15:32:23 +04:00
Andrey Kamaev
42c8a42ad3
Fix binary compatibility of opencv_objdetect
2012-10-17 02:09:34 +04:00
Andrey Kamaev
0dc3d61071
Revert "yet another portion of changes towards the binary compatibility"
...
This reverts commit 618fbf5508
.
2012-10-17 02:09:17 +04:00
Andrey Kamaev
e7b81688a4
Revert "yet another portion of changes towards the binary compatibility"
...
This reverts commit 618fbf5508
.
2012-10-16 19:35:57 +04:00
Vadim Pisarevsky
618fbf5508
yet another portion of changes towards the binary compatibility
2012-10-08 21:36:27 +04:00
Anatoly Baksheev
46874d40df
warnings under windows
2012-10-01 23:57:37 +04:00
marina.kolpakova
e1e0c46639
integrated patch: HOG confidence calculation. Thanks, Wongun.
2012-07-25 15:26:26 +04:00
Andrey Kamaev
f2d3b9b4a1
Warning fixes continued
2012-06-09 15:00:04 +00:00
Andrey Kamaev
6ca618277c
More fixes for documentation.
2012-05-28 20:11:38 +00:00
Andrey Kamaev
78329b0dfe
New bunch of documentation fixes
2012-05-28 14:36:15 +00:00
Andrey Kamaev
eb2f1f81ed
Fixed hundreds of documentation problems
2012-05-28 07:36:14 +00:00
Vadim Pisarevsky
d5a0088bbe
merged 2.4 into trunk
2012-04-30 14:33:52 +00:00
Vadim Pisarevsky
2fd1e2ea57
merged all the latest changes from 2.4 to trunk
2012-04-13 21:50:59 +00:00
Vadim Pisarevsky
33bc089506
fixed HOGDescriptor::detect and HOGDescriptor::detectMultiScale signatures (ticket #1304 )
2012-03-29 17:18:38 +00:00
Vadim Pisarevsky
957e80abbd
lot's of changes; nonfree & photo modules added; SIFT & SURF -> nonfree module; Inpainting -> photo; refactored features2d (ORB is still failing tests), optimized brute-force matcher and made it non-template.
2012-03-15 14:36:01 +00:00
Alexander Shishkov
0279ba953e
fixed warnings in linemod on Windows
2012-02-27 11:42:33 +00:00
Alexander Shishkov
e7e373307b
added exports to the LineMod classes
...
fixed compilation linemod sample on Windows
2012-02-27 11:15:01 +00:00
Andrey Kamaev
32080ece8c
Fixed Android build warning
2012-02-27 09:19:30 +00:00
Patrick Mihelich
13456c9840
Removed a finished todo
2012-02-27 08:55:57 +00:00
Patrick Mihelich
f483272d09
No longer expose internal LINE-MOD methods like response map computation, linearizing similarities, etc in public header.
2012-02-27 00:07:52 +00:00
Patrick Mihelich
f174b001f3
Initial commit of LINE-MOD source code to objdetect module.
2012-02-26 23:55:18 +00:00
Vadim Pisarevsky
716a5d04ab
fixed a few problems detected by Xcode 4.2.1
2012-02-15 19:48:04 +00:00
Leonid Beynenson
9f837d3486
Made changes concerning inserting prefiltering modes into CascadeClassifier class.
...
Now developers should call the method setFaceDetectionMaskGenerator() to use prefiltering mask generator
implemented for face detection.
2011-10-21 14:56:37 +00:00
Anatoly Baksheev
7076dfd7d6
gpu module: refactored devmem2d.hpp (atomic bomb)
2011-10-13 15:14:04 +00:00
Leonid Beynenson
da3a60a5a7
Made changes in the method of inserting prefilters into the CascadeClassifier class.
2011-10-12 11:32:01 +00:00
Leonid Beynenson
630288fdef
Added possibility of prefiltering into CascadeClassifier. Now OpenCV users can implement their own mask generators and insert them into CascadeClassifier.
2011-10-05 13:21:28 +00:00
Maria Dimashova
d3cd2cb5c0
removed porting to java of latent svm
2011-10-04 06:47:41 +00:00
Maria Dimashova
4d85ee7de1
added c++ wrapper of latent svm
2011-10-03 16:45:46 +00:00
Alexey Kazakov
50543d627f
Added HOG features to cascade detection algorithm.
...
Added pedestrian detection trained model for HOG cascade detection algorithm.
2011-09-21 18:03:53 +00:00
Vadim Pisarevsky
a51a8ad577
fixed tickets #1301 , #1303 , #1305
2011-08-14 19:46:39 +00:00
Vadim Pisarevsky
02c98152d7
export HOGDescriptor::getDefaultPeopleDetector() to Python (ticket #1298 )
2011-08-12 07:50:55 +00:00
Vadim Pisarevsky
ff5e97c8e4
added COVAR_ and SORT_ enums to core.hpp; fixed many, many VS2005, VS2010 and MinGW (GCC 4.5.2) warnings
2011-07-19 12:27:07 +00:00
Andrey Pavlenko
fbfddbd3ea
- 'c_string' support added to Java API
...
- improved CV_IN_OUT/CV_OUT handling for generated Python/Java wrappers
2011-07-12 21:13:56 +00:00
Evgeniy Kozinov
07eed8c489
refactoring latentSVM
2011-07-12 18:43:41 +00:00
Maria Dimashova
1580806730
removed DOT implementation
2011-06-14 12:28:44 +00:00
Vadim Pisarevsky
c0ec0e05c5
made datamatrix build on Windows; fixed unresolved symbols
2011-05-25 14:49:09 +00:00
Ethan Rublee
355ad2993a
adding c++ interface to the datamtrix codes of j.
2011-05-25 00:23:50 +00:00
Maria Dimashova
a360a19c56
added TBB optimization to DOT
2011-05-24 13:20:32 +00:00
Maria Dimashova
0f6b8002dc
fixed save/load of dot; added data for the sample
2011-05-10 13:30:58 +00:00
Maria Dimashova
f4c74eb532
changed the dot
2011-05-10 12:01:42 +00:00
Maria Dimashova
9ce792fb3a
minor
2011-05-02 17:03:53 +00:00
Vadim Pisarevsky
9702b5ef8a
made the samples compile on Windows
2011-04-29 12:41:30 +00:00
Maria Dimashova
cd981f4d13
started to integrate DOT detector
2011-04-26 13:57:55 +00:00
Alexey Kazakov
1e69bd5118
class MeanshiftGrouping replaced from objdetect.hpp to cascadedetect.cpp
2011-04-22 16:11:35 +00:00
Alexey Kazakov
fb0b25692e
A little fix in haar cascade
2011-04-22 11:21:40 +00:00
Alexey Kazakov
e9aa6fa012
Added ROC-curve calculating to the cascade detection algorithm
2011-04-22 10:03:05 +00:00
Vadim Pisarevsky
06070dfcf6
fixed linker errors by adding CV_EXPORTS to the exported DataMatrix functionality;
2011-04-22 09:53:10 +00:00
James Bowman
f385bb97eb
datamatrix
2011-04-21 00:47:37 +00:00
James Bowman
324e89ab3a
datamatrix
2011-04-21 00:21:42 +00:00
Alexey Kazakov
537a36115f
The bug was fixed
2011-04-19 12:31:35 +00:00
Alexey Kazakov
e863c3d5f6
Added to objdetect module: meanshift grouping (groupRectangles_meanshift(...) for input rectangles); new pedestrian detection model, trained on the Daimler base (getDaimlerPeopleDetector(...) ).
...
Some changes in the HOGDescriptor class interface(objdetect.hpp) (added useMeanShiftGrouping parameter to the detectMultiScale(...) function)
2011-04-19 09:05:15 +00:00
Alexey Kazakov
833102c19e
Replaced few methods to virtual in CascaseClassifier class (objdetect.hpp)
2011-02-24 11:03:00 +00:00
Alexey Kazakov
4e460cd7a6
Replaced private methods to protected in CascaseClassifier class (objdetect.hpp)
2011-02-24 10:24:55 +00:00
Valentina Kustikova
d03b89f163
Parallel version of Latent SVM.
2011-02-08 07:34:25 +00:00
Ilya Lysenkov
dc9e5eda19
Moved PlanarObjectDetector to the objdetect module
2010-12-27 08:25:31 +00:00
Kirill Kornyakov
93e344a962
compilation warning fixed
2010-12-15 11:32:37 +00:00
Kirill Kornyakov
c418858104
bug #762 fixed
2010-12-15 11:21:27 +00:00
Kirill Kornyakov
e7f491ae1a
CascadeClassifier refactored. Most of the members and methods are private now.
2010-12-14 10:17:45 +00:00
Kirill Kornyakov
d8415ed44e
code cleaning of cascade classifier
2010-12-09 15:09:34 +00:00
Kirill Kornyakov
515bdfa71e
added max window size parameter for cascade classifier
2010-11-18 09:10:47 +00:00
Vadim Pisarevsky
d6b0e8fb69
fixed wrapper generation
2010-11-16 16:52:20 +00:00
Alexey Spizhevoy
cc6a87fc9d
fixed big in gpu::HOGDescriptor, added property into CPU's HOGDescriptor
2010-11-16 07:40:32 +00:00
Vadim Pisarevsky
5b6a755719
almost finished Python wrappers
2010-11-02 17:58:22 +00:00
Vadim Pisarevsky
83f6085773
added more helper macros to the function declarations, to assist the Python wrapper generator. Fixed memleak in Mat::operator()(Range,Range) and the related functions (Mat::row, Mat::col etc.)
2010-10-27 18:26:39 +00:00
Vadim Pisarevsky
bddaa00e03
renamed filterObject -> CvLSVMFilterObject, position -> CvLSVMFilterPosition etc.
2010-10-18 08:49:18 +00:00
Vadim Pisarevsky
1b1eab8e67
added helper macros to the function declarations
2010-10-16 20:34:34 +00:00
Valentina Kustikova
fbfccffbaa
Integration object detection using Latent SVM. Sample was added.
2010-10-09 11:36:06 +00:00
Vadim Pisarevsky
e5872cd8bb
now C++ classes can be read/written with cvRead/cvWrite/cvLoad/cvSave. Tested on HOGDescriptor
2010-06-01 13:53:20 +00:00
Vadim Pisarevsky
127d6649a1
"atomic bomb" commit. Reorganized OpenCV directory structure
2010-05-11 17:44:00 +00:00