mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-29 22:00:25 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
22,976 Commits 6 Branches 126 Tags 3 GiB
f0b606ff77
Commit Graph

597 Commits

Author SHA1 Message Date
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
Konstantin Matskevich
84fa60abb8 update test for cascade 2014-02-05 12:06:48 +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
de4b1c668d hopefully fixed compile warnings and the doc builder warnings 2014-02-03 16:36:36 +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
3ea32b87bb perf test 2014-02-03 14:46:52 +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
Roman Donchenko
b0af6a2b58 Merge pull request #2127 from apavlenko:perf_cascades 2014-01-16 12:37:02 +04:00
Andrey Pavlenko
c7d90c8b32 adding old cascade 2014-01-14 23:15:50 +04:00
Andrey Pavlenko
9b7b360bf7 fixing compilation if WITH_OPENCL=OFF 2014-01-14 17:50:00 +04:00
Andrey Pavlenko
520a692fda switching to CL_PERF_TEST_P, adding safeFinish() to flush CL queue 2014-01-13 16:58:36 +04:00
Andrey Pavlenko
2c0e24e948 adding Haar & LBP cascades perf test using UMat, removing old incomplete test 2014-01-10 00:08:15 +04:00
Patrick Tsai
b24f7ee57c Fix compiler error with Android NDK r8e 
Original error without the fix:

opencv/modules/objdetect/src/cascadedetect.cpp: In member function 'bool cv::CascadeClassifierImpl::ocl_detectSingleScale(const cv::_InputArray&, cv::Size, int, double, cv::Size)':
/opencv/modules/objdetect/src/cascadedetect.cpp:1215:
error: no matching function for call to 'cv::ocl::Kernel::args(cv::ocl::KernelArg, cv::ocl::KernelArg, cv::ocl::KernelArg, int, cv::ocl::KernelArg, cv::ocl::KernelArg, cv::ocl::KernelArg, cv::Size&, int&, float, cv::Rect&, cv::Size&, cv::CascadeClassifierImpl::<anonymous enum>)'
 2014-01-09 14:49:20 +08:00
Roman Donchenko
9dfb96389c Merge commit '4b885e206' into merge-2.4 2013-12-30 16:48:45 +04:00
Alexander Karsakov
6ef0253fb7 Disabled some IPP implementation since it breaks tests 2013-12-26 19:53:53 +04:00
Vadim Pisarevsky
bc730292bb workaround for some strange bug on old Mac. 2013-12-23 21:29:31 +04:00
Vadim Pisarevsky
8998186ce4 removed extra whitespaces and hopefully fixed the test failures 2013-12-23 18:41:54 +04:00
Vadim Pisarevsky
d084d19779 added OpenCL optimization for LBP-based face detector 2013-12-23 15:28:50 +04:00
Vadim Pisarevsky
1540910542 started adding OpenCL acceleration of LBP-based object detectors 2013-12-20 18:39:35 +04:00
Vadim Pisarevsky
242a3d1f19 2 more fixes to calm down the doc builder 2013-12-19 16:57:02 +04:00
Vadim Pisarevsky
f41f633d2d fixed various warnings from the “doc” and other builders 2013-12-19 16:31:30 +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
Vadim Pisarevsky
b7553d4e2e some attempts to tune the performance 2013-12-19 14:09:44 +04:00
Vadim Pisarevsky
02fb3f0a77 it finally works!!! 2013-12-17 20:55:49 +04:00
Vadim Pisarevsky
ef509ace43 trying to debug the new cascade 2013-12-17 14:51:22 +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
302a5adcc2 converted Haar cascades to the new format; now they are handled with C++ code. 2013-12-10 22:54:37 +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
Roman Donchenko
d58cd9851f Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	CMakeLists.txt
	cmake/OpenCVDetectCUDA.cmake
	doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.rst
	modules/core/src/cmdparser.cpp
	modules/gpu/CMakeLists.txt
	modules/gpu/doc/introduction.rst
	modules/gpu/perf/perf_video.cpp
	modules/highgui/doc/reading_and_writing_images_and_video.rst
	modules/ocl/src/cl_context.cpp
	modules/video/include/opencv2/video/background_segm.hpp
	samples/cpp/image_sequence.cpp
	samples/cpp/tutorial_code/ImgTrans/HoughCircle_Demo.cpp
	samples/python/chessboard.py
	samples/python/cvutils.py
	samples/python/demhist.py
	samples/python/dft.py
	samples/python/distrans.py
	samples/python/edge.py
	samples/python/ffilldemo.py
	samples/python/fitellipse.py
	samples/python/houghlines.py
	samples/python/inpaint.py
	samples/python/logpolar.py
	samples/python/morphology.py
	samples/python/numpy_array.py
	samples/python/watershed.py
 2013-12-03 17:35:21 +04:00
Roman Donchenko
10aec14a4d Merge pull request #1849 from StevenPuttemans:feature_3375_documentation 2013-11-27 13:22:31 +04:00
Roman Donchenko
9c2272d520 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	.gitignore
	CMakeLists.txt
	doc/CMakeLists.txt
	modules/calib3d/src/stereosgbm.cpp
	modules/core/include/opencv2/core/mat.hpp
	modules/highgui/src/cap_openni.cpp
	modules/ml/include/opencv2/ml/ml.hpp
	modules/objdetect/src/hog.cpp
	modules/ocl/perf/perf_color.cpp
	modules/ocl/src/arithm.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/optical_flow_farneback.cpp
	platforms/scripts/camera_build.conf
	platforms/scripts/cmake_android_all_cameras.py
	samples/cpp/Qt_sample/main.cpp
	samples/cpp/tutorial_code/introduction/windows_visual_studio_Opencv/Test.cpp
 2013-11-26 15:05:26 +04:00
StevenPuttemans
6f892b10ff Applied feature #3375 and fix of pull 1842 to avoid merging problems later 2013-11-25 10:53:03 +01:00
Piotr Miecielica
a19cc6cb64 Added pointer initialization 2013-11-22 13:33:33 +01:00
Piotr Miecielica
923698d700 Fixes of some memory leaks 2013-11-21 18:55:09 +01:00
Vadim Pisarevsky
e2bbe7597b fixed few compile errors and doc build errors 2013-11-18 13:48:04 -05:00
Vadim Pisarevsky
8762ee3f6f removed unnecessary opencl kernels 2013-11-18 12:02:10 -05:00
Vadim Pisarevsky
d914f20a4c updated patch to bring in the first functions with "transparent API" 2013-11-18 11:48:00 -05:00
Anatoly Baksheev
e154bce259 fixed compilation for vs2008 2013-11-17 14:13:13 +04:00
Roman Donchenko
334292083e Merge pull request #1629 from lluisgomez:er_tree_clean_bug_fix 2013-10-29 16:03:51 +04:00
lluis
b50185e160 Fix a bug in the er tree clean-up process (see discussion in https://github.com/Itseez/opencv/pull/1520). It's not necessary to walk the er tree in order to clean up the memory since it's possible to cleanup the regions in the stack just by iterating over the er_stack vector instead of walking the tree structure. This turns out to be safer because the tree structure of those regions may have been modified previously in er_save function. 2013-10-15 19:44:08 +02:00
Ilya Lavrenov
35d9ce0c0c fixed warnings 2013-10-08 12:46:43 +04: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
Alexander Smorkalov
0d49206a98 Merge pull request #1485 from vpisarev:ipp_fixes 2013-09-26 11:09:59 +04:00
lluis
5670e4f6cd fixed typos 2013-09-23 10:17:47 +02:00
lluis
5556f051f1 added rst documentation for the Class-specific Extremal Regions for Scene Text Detection 2013-09-20 21:39:11 +02:00
Vadim Pisarevsky
8e7eb79f6e fixed compile errors and warnings when building master branch with IPP enabled 2013-09-20 16:02:15 +04: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
ad94628038 Using cv::magnitude instead of custom loop and Mat<float> instead of Mat<double> to compute gradient magnitude channel. 2013-09-09 18:37:55 +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
512111af9c removed blank line at EOF 2013-09-06 12:32:10 +02:00
lluis
1cc6502db3 removed unnecessary commented block 2013-09-06 12:32:10 +02:00
lluis
04913f5af7 removed trailing whitespaces 2013-09-06 12:32:10 +02:00
lluis
f4d01175b8 fixed a bug in the calculation of the number of inflexion points feature 2013-09-06 12:31:49 +02:00
lluis
765921cc25 fixed a typo error in the default min_Probability param of CreateERFilterNM2 2013-09-06 12:30:22 +02:00
lluis
dba336c0e3 fixed a bug in the non-max-suppression filter procedure 2013-09-06 12:27:19 +02:00
Roman Donchenko
a50d75d362 Made Filestorage able to not own its CvFileStorage instance. 
This allows to get rid of the last remaining Ptr<T>::addref calls.
 2013-09-05 19:03:00 +04:00
Roman Donchenko
b12894d95a Boring changes - objdetect. 2013-09-05 19:02:58 +04:00
Roman Donchenko
dd25f416a6 War on Whitespace, master edition: tabs. 2013-08-27 17:13:53 +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
2c4bbb313c Merge commit '43aec5ad' into merge-2.4 
Conflicts:
	cmake/OpenCVConfig.cmake
	cmake/OpenCVLegacyOptions.cmake
	modules/contrib/src/retina.cpp
	modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
	modules/gpu/doc/video.rst
	modules/gpu/src/speckle_filtering.cpp
	modules/python/src2/cv2.cv.hpp
	modules/python/test/test2.py
	samples/python/watershed.py
 2013-08-27 13:26:44 +04:00
Roman Donchenko
e9a28f66ee Normalized file endings. 2013-08-21 18:59:25 +04:00
Roman Donchenko
f55740da70 Deleted all trailing whitespace. 2013-08-21 18:59:24 +04:00
Roman Donchenko
893e8b4371 Merge pull request #942 from achalddave:patch-1 2013-08-21 16:06:31 +04:00
Roman Donchenko
f76dd99299 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	cmake/OpenCVModule.cmake
	doc/tutorials/calib3d/camera_calibration/camera_calibration.rst
	doc/tutorials/features2d/feature_detection/feature_detection.rst
	doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.rst
	doc/tutorials/features2d/feature_homography/feature_homography.rst
	modules/core/include/opencv2/core/operations.hpp
	modules/core/src/arithm.cpp
	modules/gpu/perf/perf_video.cpp
	modules/imgproc/include/opencv2/imgproc/imgproc.hpp
	modules/java/generator/gen_java.py
	modules/java/generator/src/cpp/VideoCapture.cpp
	modules/nonfree/src/opencl/surf.cl
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/perf_haar.cpp
	modules/ocl/perf/perf_precomp.hpp
	modules/ocl/src/color.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/test/test_color.cpp
	modules/ocl/test/test_objdetect.cpp
	modules/python/src2/cv2.cpp
	samples/gpu/CMakeLists.txt
	samples/gpu/super_resolution.cpp
 2013-08-19 19:02:36 +04:00
Achal Dave
0bc609257d Comparing rejected stage index with minimum required neighbors does not make sense 
As described here, http://code.opencv.org/issues/3064, the test before
led to a case where we compared the index of the latest stage at which a
rectangle was rejected with the minimum number of neighbors required as
specified in `detectMultiScale`. Please see the issue for more
information.
 2013-08-13 20:42:04 -07:00
Roman Donchenko
6b5ac42a9b Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
	modules/features2d/doc/common_interfaces_of_descriptor_extractors.rst
	modules/features2d/doc/object_categorization.rst
	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/imgproc/doc/miscellaneous_transformations.rst
	modules/imgproc/doc/object_detection.rst
	modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
	modules/imgproc/src/samplers.cpp
	modules/ml/doc/k_nearest_neighbors.rst
	modules/nonfree/doc/feature_detection.rst
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/photo/doc/inpainting.rst
	modules/ts/include/opencv2/ts.hpp
	platforms/scripts/camera_build.conf
	samples/android/camera-calibration/AndroidManifest.xml
 2013-08-13 12:56:39 +04:00
Roman Donchenko
d9f71b762f Deleted almost all of the precomp.cpp files. 
Looks like we don't actually use them; when creating precompiled headers
with Visual C++, a dummy .cpp is created at build time.
 2013-08-08 12:43:07 +04:00
StevenPuttemans
ed76b2f98f Like mentioned by Andrei Pavlenko after merging pullrequest #1206, a wrong 
ReST directive was used. Also fixed some other ReST directives that were
not correct and removed some warnings during buildbot checks.
 2013-08-07 14:49:33 +02: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
StevenPuttemans
f28496c628 Added sample links in documentation for python2, ocl and gpu 2013-08-02 14:05:08 +02:00
Andrey Pavlenko
9b5d1596dc Merge pull request #891 from NCBee:2.4 2013-07-31 16:38:16 +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
9fbff009e9 fixed compilation errors and warnings on builds 3298 and 4384 2013-07-20 11:35:56 +02:00
lluis
6adba09463 fixed some warnings on build 4285 2013-07-20 11:13:38 +02:00
lluis
1d8e80aa3b add opencv_ml headers to precomp 2013-07-20 10:33:42 +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
Roman Donchenko
ac39bfb4cc Remove HAVE_CVCONFIG_H - it's always defined. 2013-07-10 16:02:07 +04: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
Roman Donchenko
d583a79869 Revert "Add a variant of detectMultiScale with an argument 'weights'" 
It was merged by mistake.

This reverts commit ab6be9b7b7.
 2013-06-10 17:06:34 +04:00
Peter Minin
ab6be9b7b7 Add a variant of detectMultiScale with an argument 'weights' that 
receives the number of neighbors joined into each detected object
 2013-06-06 19:00:55 +04:00
Roman Donchenko
bae85660da Merge remote-tracking branch 'origin/2.4' 
Pull requests:
	#943 from jet47:cuda-5.5-support
	#944 from jet47:cmake-2.8.11-cuda-fix
	#912 from SpecLad:contributing
	#934 from SpecLad:parallel-for
	#931 from jet47:gpu-test-fixes
	#932 from bitwangyaoyao:2.4_fixBFM
	#918 from bitwangyaoyao:2.4_samples
	#924 from pengx17:2.4_arithm_fix
	#925 from pengx17:2.4_canny_tmp_fix
	#927 from bitwangyaoyao:2.4_perf
	#930 from pengx17:2.4_haar_ext
	#928 from apavlenko:bugfix_3027
	#920 from asmorkalov:android_move
	#910 from pengx17:2.4_oclgfft
	#913 from janm399:2.4
	#916 from bitwangyaoyao:2.4_fixPyrLK
	#919 from abidrahmank:2.4
	#923 from pengx17:2.4_macfix

Conflicts:
	modules/calib3d/src/stereobm.cpp
	modules/features2d/src/detectors.cpp
	modules/gpu/src/error.cpp
	modules/gpu/src/precomp.hpp
	modules/imgproc/src/distransform.cpp
	modules/imgproc/src/morph.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/perf_color.cpp
	modules/ocl/perf/perf_imgproc.cpp
	modules/ocl/perf/perf_match_template.cpp
	modules/ocl/perf/precomp.cpp
	modules/ocl/perf/precomp.hpp
	modules/ocl/src/arithm.cpp
	modules/ocl/src/canny.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/src/haar.cpp
	modules/ocl/src/hog.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/opencl/haarobjectdetect.cl
	modules/ocl/src/pyrlk.cpp
	modules/video/src/bgfg_gaussmix2.cpp
	modules/video/src/lkpyramid.cpp
	platforms/linux/scripts/cmake_arm_gnueabi_hardfp.sh
	platforms/linux/scripts/cmake_arm_gnueabi_softfp.sh
	platforms/scripts/ABI_compat_generator.py
	samples/ocl/facedetect.cpp
 2013-06-05 15:42:07 +04:00
Roman Donchenko
29b13ec1de Replaced most of the usages of parallel_for with that of parallel_for_. 
This should allow many algorithms to take advantage of more parallelization
technologies.
 2013-05-31 12:22:04 +04:00
Bahram Dahi
e2d6a3abe5 Added spacing in a nested template argument list. 2013-05-24 18:44:03 -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
Roman Donchenko
029fce10c9 Merge remote-tracking branch 'origin/2.4' 
Conflicts:
	3rdparty/libjasper/CMakeLists.txt
	cmake/OpenCVDetectOpenCL.cmake
	modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
	modules/imgproc/src/floodfill.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/src/arithm.cpp
	modules/ocl/src/haar.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/initialization.cpp
	modules/ocl/src/matrix_operations.cpp
	modules/ocl/src/mcwutil.cpp
	modules/ocl/src/opencl/arithm_bitwise_and_mask.cl
	modules/ocl/src/opencl/arithm_bitwise_and_scalar_mask.cl
	modules/ocl/src/opencl/arithm_bitwise_binary_mask.cl
	modules/ocl/src/opencl/arithm_bitwise_binary_scalar.cl
	modules/ocl/src/opencl/arithm_bitwise_binary_scalar_mask.cl
	modules/ocl/src/opencl/arithm_bitwise_or.cl
	modules/ocl/src/opencl/arithm_bitwise_or_scalar.cl
	modules/ocl/src/opencl/arithm_bitwise_or_scalar_mask.cl
	modules/ocl/src/opencl/arithm_bitwise_xor.cl
	modules/ocl/src/opencl/arithm_bitwise_xor_mask.cl
	modules/ocl/src/opencl/arithm_bitwise_xor_scalar.cl
	modules/ocl/src/stereobm.cpp
	modules/ocl/test/precomp.hpp
	modules/python/src2/api
	modules/ts/src/ts_func.cpp
	samples/gpu/bgfg_segm.cpp
 2013-05-21 17:19:23 +04:00
Bahram Dahi
8c25f9f28a [3rd attempt] fixed HOGDescriptor::detectMultiScale() to group weights as well as ROIs 2013-05-20 13:20:57 -04:00
ShengyinWu
ef5578a7ce Fixs: After scaling back to original image, some detected ROI will outside the original image ROI 2013-04-29 12:16:42 +08:00
Andrey Kamaev
8b294c6c90 Remove documentation for old python wrapper 2013-04-12 19:37:40 +04:00
Andrey Kamaev
5e048d1fa5 Move C API of opencv_objdetect to separate file 
Also move cv::linemod to own header
 2013-04-12 14:37:01 +04:00
Andrey Kamaev
c98c246fc2 Move border type constants and Moments class to core module 2013-04-10 19:14:24 +04:00
Andrey Kamaev
befd696720 Update documentation 2013-04-08 15:47:29 +04:00
Andrey Kamaev
0738ea7d0f Make highgui.hpp independent from C API 2013-04-08 15:47:29 +04:00
Andrey Kamaev
288a0634c2 Make imgproc.hpp independent from C API 2013-04-08 15:47:28 +04:00
jackculpepper
297e6d0b73 mark multiple return arguments for python bindings 2013-04-04 00:51:52 -07:00
Andrey Kamaev
517062039e Make core/internal.hpp a private header 2013-04-01 17:29:10 +04:00
Andrey Kamaev
3890a74565 Drop outdated definitions from internal.hpp 
This also fixes few clang build errors
 2013-04-01 15:24:35 +04:00
Andrey Kamaev
4ab650d15b Remove gcd function from core headers 2013-04-01 15:24:34 +04:00
Andrey Kamaev
2b1ef95415 Completely separate C and C++ API of OpenCV core 2013-04-01 15:24:34 +04:00
Andrey Kamaev
715fa3303e Move cv::Mat out of core.hpp 2013-04-01 15:24:34 +04:00
Andrey Kamaev
62adc01980 Move cv::Rect_ 2013-04-01 15:24:33 +04:00
Andrey Kamaev
addf0309ec Move cv::Size_ 2013-04-01 15:24:32 +04:00
Andrey Kamaev
13b31b0804 Move C++ basic structures to separate header and inverse dependency from C API 
cv::Complex, cv::Point_ and cv::Point3_ are moved.
 2013-04-01 15:24:32 +04:00
Andrey Kamaev
19f8f85c51 Move C structures wrappers from core.hpp to core_c.h 
Also move RTTIImpl class to the only usage
 2013-04-01 15:24:32 +04:00
Vladislav Vinogradov
b62cf65b91 fixed inconsistent new/delete operators 2013-04-01 11:55:02 +04:00
Andrey Kamaev
04eabf8d9f Merge pull request #699 from jacob-baines/patch-1 
Mismatching new[] / delete
 2013-03-25 03:26:18 -07:00
Jacob Baines
1e1645e214 Mismatching new[] / delete 2013-03-24 22:45:31 -03:00
Andrey Kamaev
33ef7990b0 Update documentation 2013-03-22 22:14:54 +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
75513a46dc Remove all include directives for <string> 2013-03-22 22:14:47 +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
89356ff16d Move non-CV functionality from core.hpp to separate utility.hpp header 2013-03-20 17:56:06 +04:00
Andrey Kamaev
0b0c9be771 Merge pull request #636 from ilya-lavrenov:SSE2_HOG 2013-03-18 15:56:16 +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
Ilya Lavrenov
8b510ad8dc sse2 hog 2013-03-11 20:21:48 +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
Haoxiang Li
3f86fd82f8 update: detected rectangles may be partially outside the image 2013-02-15 11:05:56 -05:00
Andrey Kamaev
b44b920997 Merge branch '2.4' 2013-02-12 16:30:18 +04:00
Andrey Kamaev
37d695a62e Use gtest assertions in cascade test 
This simplifies test debugging a lot
 2013-02-06 15:07:31 +04:00
Andrey Kamaev
c527340cb6 Merge branch 2.4 2013-02-04 17:15:55 +04:00
Andy Maloney
b79e8053c1 Check memory allocation 
Declare vars as locally as possible
 2013-02-02 08:44:25 -05:00
Andy Maloney
bc68dfb4e8 Remove unused vars 2013-02-01 18:09:58 -05:00
cuda-geek
f52ce6529b Merge pull request #322 from cuda-geek:training 2013-02-01 18:45:12 +04:00
Andrey Kamaev
61079547f0 Merge branch '2.4' 2013-02-01 14:59:40 +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
Vadim Pisarevsky
638c0d1bf4 fixed compile warnings 2013-02-01 10:47:27 +04:00
Vadim Pisarevsky
50299c1d5e disabled the use of SSE4 instructions as well to make the code compatible with the old Intel and AMD chips 2013-01-31 22:57:46 +04:00
Vadim Pisarevsky
18039d7829 added test for the old cvHaarDetectObjects. disabled AVX optimization in haar.cpp. it should cover tickets #2534, #2591, #2669 2013-01-31 22:55:04 +04:00
cuda-geek
d874d93e24 Merge pull request #372 from cuda-geek:gpu-cascade-fixes 2013-01-31 20:13:31 +04:00
Andrey Kamaev
57d3152cd0 Merge branch '2.4' 2013-01-31 14:35:27 +04:00
cuda-geek
53b0df87f1 Merge pull request #385 from etalanin:bug2607 2013-01-31 13:46:01 +04:00
Evgeny Talanin
50c2f87add Fix and test for #2607 2013-01-31 12:23:08 +04:00
marina.kolpakova
5b03d47fb8 fix broken links in cascade classification documentation 2013-01-30 19:28:16 +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
Andrey Kamaev
78a338159d Merge branch '2.4' 2013-01-29 14:17:13 +04:00
Andy Maloney
5bd56e7464 Fix mem leak and mismatched new/delete 2013-01-28 17:57:19 -05:00
Andrey Kamaev
f4e27bcbbc Merge branch '2.4' 2013-01-25 16:30:36 +04:00
Siegfried Hochdorfer
195d501b43 fixed broken indentation 2013-01-24 11:40:35 +01:00
marina.kolpakova
e15bdea663 fix test for new cascade 2013-01-18 17:14:11 +04:00
marina.kolpakova
53433884ee fix python wrapping 2013-01-18 15:58:48 +04:00
marina.kolpakova
f9649a029b fix typo 2013-01-18 15:58:47 +04:00
marina.kolpakova
0a40bbd0d0 add two types of feature boxes support: 
- (left, top, width, height)
 - (left, top, right, bottom)
 2013-01-18 15:58:47 +04:00
marina.kolpakova
913faf2ef4 fix test for a new test data 2013-01-18 15:58:47 +04:00
marina.kolpakova
9efd668a57 a bit refactored soft cascade 2013-01-18 15:58:47 +04:00
marina.kolpakova
f1b4b13e64 perf test 2013-01-18 15:58:47 +04:00
marina.kolpakova
0c6c78d149 integrate 128x256 scale; remove log 2013-01-18 15:58:47 +04:00
marina.kolpakova
e09694bde8 integrated 128x256 scale 2013-01-18 15:58:47 +04:00
marina.kolpakova
3e7965a5a5 first debug integration of newly trained cascade 2013-01-18 15:58:46 +04:00
Siegfried Hochdorfer
82a9f9a5a9 MeanshiftGrouping Bugfix (Bug #2685) 2013-01-17 11:46:24 +01:00
Andrey Kamaev
084b1c7969 Merge branch 2.4 2013-01-11 15:45:23 +04:00
Andrey Kamaev
399c20a928 Merge pull request #272 from 5kg:fix_haar 2013-01-09 16:53:11 +04:00
marina.kolpakova
e53d57664d fix precompiled headers usage in gpu module 2012-12-30 16:58:41 +04:00
Zifei Tong
260bdc057c Changed parallel_for to parallel_for_ in haar.cpp 2012-12-28 22:56:47 +08:00
Zifei Tong
e331787645 Fix race condition for Cascade Classifier when TBB enabled. 2012-12-28 20:51:02 +08:00
Andrey Kamaev
962884cdec Merge branch 2.4 2012-12-21 17:58:48 +04:00
Andrey Kamaev
ca7abe1239 Reduce number of performance tests for LBP cascade 2012-12-20 12:25:59 +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
Andrey Kamaev
e10ee89ec4 Merge branch 2.4 2012-11-30 19:54:24 +04:00
Maria Dimashova
97e36b9375 fix a compile error in case of building without highgui 2012-11-24 18:10:29 +04:00
marina.kolpakova
6ccd7aca4c fix tests for arm 2012-11-22 13:26:13 +04:00
marina.kolpakova
be40bd5c74 Merge remote-tracking branch 'cuda-geek/soft-cascade-cpu' 2012-11-13 23:37:44 +04:00
marina.kolpakova
1edab12068 fix for negative confidence 2012-11-13 23:08:19 +04:00
Andrey Kamaev
9719ea93b6 Merge branch 2.4 2012-11-13 19:54:48 +04:00
marina.kolpakova
bd9ca48fab export to python/java 2012-11-13 02:49:35 +04:00
Andrey Kamaev
a126532cb7 Fix OS X build warnings 2012-11-09 11:29:52 +04:00
marina.kolpakova
665bf430d5 fix warnings under win 2012-11-09 00:07:32 +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
f93cffaa0d fix compilation under win 2012-11-08 02:34:49 +04:00
marina.kolpakova
1022094dc0 fix levels computing 2012-11-08 02:34:49 +04:00
marina.kolpakova
f1e36043e6 clean code 2012-11-08 02:34:49 +04:00
marina.kolpakova
4656872161 fixed typo 2012-11-08 02:34:49 +04:00
marina.kolpakova
5fb9f48360 fix angle scaling 2012-11-08 02:34:49 +04:00
marina.kolpakova
31a073ca66 documentation 2012-11-08 02:34:49 +04:00
marina.kolpakova
4207552e19 add object init 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
65543c53f6 update test according to resize usage 2012-11-08 02:34:48 +04:00
marina.kolpakova
4a1c4a9862 soft cascade become Algorithm 2012-11-08 02:34:48 +04:00