Andrey Pavlenko
38f46eb3b4
fixing issues from coverity scan 1167937, 1167938, 1167939, 1127248 ( http://scan.coverity.com/projects/169?tab=Overview )
2014-02-06 21:33:44 +04:00
Andrey Pavlenko
22146e4b18
Merge pull request #2234 from KonstantinMatskevich:ocl_tapi_hog
2014-02-04 16:35:12 +04:00
Konstantin Matskevich
3495c5953c
fixes
2014-02-03 16:38:06 +04:00
Vadim Pisarevsky
30593ee55e
3rd attempt to prepare patch with improved OpenCL kernels of CascadeClassifier.
2014-02-03 15:12:27 +04:00
Konstantin Matskevich
5c38519c65
some changes
2014-02-03 14:46:53 +04:00
Konstantin Matskevich
9a62df1650
HOG
2014-02-03 14:46:52 +04:00
Ilya Lavrenov
37789f015a
deleted excess semicolons, commas
2014-01-18 01:31:33 +04:00
Vadim Pisarevsky
9d3e7e027a
almost finished opencl-ization of cascade classifier
2013-12-17 14:29:30 +04:00
Vadim Pisarevsky
d8513d627d
continue adding OpenCL optimization to cascade classifier
2013-12-12 21:58:42 +04:00
Vadim Pisarevsky
fdf1996e2e
added old=>new cascade conversion function
2013-12-07 01:51:35 +04:00
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