mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-12-23 07:58:00 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
11,635 Commits 6 Branches 127 Tags 3 GiB
3d3b310ae1
Commit Graph

1665 Commits

Author SHA1 Message Date
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
657699a1da Merge pull request #1267 from clhsieh:gpu_example_build_failed_with_cuda5p5 2013-08-27 12:43:36 +04:00
Fedor Morozov
833f8d16fa Robertson and tutorial 2013-08-26 15:23:37 +04:00
Roman Donchenko
580677f43d Merge pull request #1304 from berak:doc_tut_cascade 2013-08-23 15:18:06 +04:00
Kirill Kornyakov
030fa5673e bugfix-for-3231 2013-08-23 12:34:35 +04:00
Changlin Hsieh
723ba29660 Update cmake files by using CUDA_CUDA_LIBRARIES 2013-08-23 16:05:35 +08:00
berak
50288f1314 rebased commits 2013-08-22 18:40:30 +02:00
berak
926d6876d3 using VideoCapture instead of CvCapture* in cascade tutorial 
corrected constants,  changed objdetection.cpp as well

updated objDetection2.cpp as well

fixed headers in objdetection2.cpp

removed useles RNG

fixed buildbot warnings (wow, i like that bot!)

victim of the war on whitespace

fixing buildbot warnings

fixing last buildbot warning, heya .

trying to rebase/squash commits
 2013-08-22 17:38:59 +02:00
Roman Donchenko
3c137f7a04 Converted tabs to spaces. 2013-08-21 18:59:26 +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
zio dodo
449b4d8a65 Added the tutorial on background subtraction, in the video section 2013-08-21 12:06:48 +02: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
Roman Donchenko
7919bcef70 Merge pull request #1277 from NCBee:2.4 2013-08-16 19:59:12 +04:00
Bahram Dahi
230bc03d97 Moved Scalar variable 'value' to int main() to work around a GCC -Wshadow warning in operations.hpp 2013-08-16 08:14:32 -07:00
Roman Donchenko
2530b580a8 Merge branch 'master' into merge-2.4 
Conflicts:
	modules/photo/doc/inpainting.rst
 2013-08-16 14:14:12 +04:00
Jin Ma
8fb6b689c6 1. Added OpenCL version of superres to the sample. 
2. Modified according to the feedback of the community.
 2013-08-16 16:31:31 +08:00
Jin Ma
3fb0bf6e99 Added MOG and MOG2. 2013-08-16 14:19:46 +08:00
Roman Donchenko
73c5069f54 Merge pull request #1276 from nghiaho12:mushroom 2013-08-15 12:05:02 +04:00
Nghia Ho
21641d04a7 Fixed mismatching allocation and deallocation: el_ptr 2013-08-14 23:36:29 +10:00
Roman Donchenko
7992402ecf Merge pull request #1149 from jet47:generalized-hough-refactoring 2013-08-14 13:26:24 +04:00
Changlin Hsieh
c1dd38cbff Fix GPU example build failed with cuda 5.5 2013-08-14 16:16:03 +08:00
Roman Donchenko
339dd983ee Adjusted the camera calibration sample to master API. 2013-08-13 14:55:27 +04: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
Daniil Osokin
65c5c4df70 Fixed build of camera calibration android sample 2013-08-08 09:31:25 +04:00
Roman Donchenko
2f780ed994 Fix whitespace errors. 2013-08-06 18:07:00 +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
Andrey Pavlenko
4c03afe006 Merge pull request #1079 from AlexeySpizhevoy:master 2013-08-05 10:54:44 +04:00
Andrey Pavlenko
487ff4f3aa Merge pull request #1151 from jet47:gpubgsegm-refactoring 2013-08-05 10:20:00 +04:00
Andrey Pavlenko
4ed9b1ca9a Merge pull request #1166 from StevenPuttemans:patch_2288 2013-07-31 15:50:13 +04:00
StevenPuttemans
f33fe94c0d Added the sample from patch #2288 : reading in sequence of images 
Added bugfixes
- Changed CV_WINDOW_NORMAL to 1
- Changed the help function to static
- Added extra help information on mask specifics
 2013-07-31 13:38:18 +02:00
Andrey Pavlenko
cd62f9f7cb Merge pull request #1164 from bitwangyaoyao:master_fixHaar 2013-07-30 16:14:24 +04:00
Daniil Osokin
23c802b4cd Added camera calibration sample for android 2013-07-26 01:19:32 +04:00
Roman Donchenko
8afb7a40c6 Merge pull request #1159 from lluisgomez:scene_text_detection_NM 2013-07-25 12:13:49 +04:00
Roman Donchenko
45f7c83da4 Merge pull request #1119 from 23pointsNorth:lsd 2013-07-24 13:50:11 +04:00
Daniel Angelov
ae93a3e681 The accurate LineSegmentDetector object. 2013-07-22 15:08:23 +03:00
Daniel Angelov
26847f92b3 Fixed the sample. 2013-07-22 14:46:34 +03:00
Daniel Angelov
982ccd784e Added the update on the sample. 2013-07-22 13:49:33 +03:00
yao
3d3e9ab635 Fix the problem of haar caused by merge 2013-07-22 17:53:56 +08:00
Daniel Angelov
965b3759b1 Update on the class to reflect the review. Split the class into virtual and implementation. change of name to LineSegmentDetector, using Input/Output-Arrays, general clean ups. 2013-07-21 01:31:51 +03: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
Vladislav Vinogradov
62edeeed16 refactored FGD algorithm 2013-07-18 15:39:42 +04:00
Vladislav Vinogradov
697793090d refactored GMG algorithm 2013-07-18 15:39:42 +04:00
Vladislav Vinogradov
b8f0d1a0e4 refactored MOG2 algorithm 2013-07-18 15:39:42 +04:00
Vladislav Vinogradov
a2adab7283 refactored MOG algorithm 
converted it to abstract interface
 2013-07-18 15:39:42 +04:00
Vladislav Vinogradov
7b87d72d80 refactored generalized hough (both CPU and GPU): 
removed set/get methods from Algorithm (implement owns)
removed GHT_* enumeration
 2013-07-18 15:17:33 +04:00
Vladislav Vinogradov
39a25115e0 fixed compilation 2013-07-17 11:41:48 +04:00
Vladislav Vinogradov
de56163f97 refactored gpu::matchTemplate (converted it into Algorithm) 2013-07-17 11:39:57 +04:00
Vladislav Vinogradov
70e6dc615a refactored GoodFeaturesToTrackDetector 2013-07-17 11:39:56 +04:00
Vladislav Vinogradov
d7ff3ad0cf refactored cornerHarris and cornerMinEigenVal 
* converted it into Algorithm
 2013-07-17 11:39:55 +04:00
Vladislav Vinogradov
ad4d6bed9d refactored gpu::GeneralizedHough 2013-07-17 11:39:55 +04:00
Vladislav Vinogradov
1652540a1f refactored HoughLines (converted it into Algorithm) 2013-07-17 11:39:54 +04:00
Vladislav Vinogradov
48fb8c4f8a refactored gpu::Canny (converted it into Algorithm) 2013-07-17 11:39:53 +04:00
Vladislav Vinogradov
fc8476544c switched to Input/Output Array in Histogram Processing 2013-07-17 11:39:52 +04:00
Vladislav Vinogradov
9eea9835ab switched to Input/Output Array in Color Processing 2013-07-17 11:39:52 +04:00
Roman Donchenko
3443fd85cd Merge pull request #984 from albenoit:master 2013-07-16 11:57:52 +04:00
alexandre benoit
7fe78efda3 retina included in namespace bioinspired + followed suggestions made by Vadim 2013-07-14 19:28:37 +02:00
Daniel Angelov
22c8010b2d Added needed header, changed macro name. 2013-07-14 12:56:22 +03:00
Daniel Angelov
6bd5e12be3 Added a sample to show usage of the class. 2013-07-13 04:11:27 +03:00
Vladislav Vinogradov
2932beddcf switched to Input/Output Array in gpuwarping functions 2013-07-12 08:12:48 +04:00
Roman Donchenko
c05bfe9d6d Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	modules/features2d/include/opencv2/features2d/features2d.hpp
	modules/ocl/src/opencl/stereobp.cl
	modules/ocl/src/stereobp.cpp
 2013-07-08 18:47:38 +04:00
Alexander Smorkalov
69b308a368 Various fixes in android sample NativeActivity. 2013-07-05 14:08:37 +04:00
alexandre benoit
188f889949 Merge branch 'master' of code.opencv.org:opencv 2013-07-04 16:19:24 +02:00
Roman Donchenko
4cf9990d4e Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	doc/tutorials/definitions/noContent.rst
	doc/tutorials/gpu/gpu-basics-similarity/gpu-basics-similarity.rst
	doc/tutorials/introduction/android_binary_package/dev_with_OCV_on_Android.rst
	doc/tutorials/introduction/how_to_write_a_tutorial/how_to_write_a_tutorial.rst
	modules/core/include/opencv2/core/core.hpp
	modules/core/include/opencv2/core/internal.hpp
	modules/core/include/opencv2/core/version.hpp
	modules/gpu/CMakeLists.txt
	modules/highgui/perf/perf_output.cpp
	modules/highgui/test/test_video_io.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/main.cpp
	modules/ocl/src/hog.cpp
	modules/ocl/src/initialization.cpp
	modules/ocl/src/moments.cpp
	modules/ocl/src/opencl/moments.cl
	modules/ocl/test/main.cpp
	modules/ocl/test/test_moments.cpp
	modules/python/test/test.py
	modules/ts/include/opencv2/ts/ts_perf.hpp
	modules/ts/src/precomp.hpp
	modules/ts/src/ts_perf.cpp
 2013-07-03 19:53:21 +04:00
Alexey Spizhevoy
37ea872204 added handling of camera parameters estimation errors (#3122) 2013-07-03 15:20:14 +04:00
Andrey Pavlenko
89086bdb8d Merge pull request #1046 from SpecLad:merge-2.4 2013-07-02 15:39:07 +04:00
Roman Donchenko
c8cd2cf601 Merge pull request #1061 from bitwangyaoyao:2.4_fix2 2013-07-01 13:21:12 +04:00
Alexander Smorkalov
67d4d9e9f4 Path to OpenCV dll libs fixes. 2013-06-28 16:48:27 +04:00
Kirill Kornyakov
aef347e7b3 Removed references to opencv.itseez.com 2013-06-28 12:48:12 +04:00
yao
c73a10cb4d warnings fix 2013-06-28 16:23:01 +08:00
Kirill Kornyakov
cbed07bc18 Removed references to YG from samples 2013-06-28 12:21:52 +04:00
yao
6982ea5a66 some tweaks to samples 2013-06-28 15:08:39 +08:00
yao
f1d9680ba8 format the ocl's samples name 2013-06-28 11:44:43 +08:00
Alexander Smorkalov
347c86d9b5 Windows RT related code cleanup. 
Windows RT sample cleanup.
Video I/O code cleanup.
 2013-06-26 05:44:10 -07:00
Roman Donchenko
f36f8067bc Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	modules/calib3d/include/opencv2/calib3d/calib3d.hpp
	modules/core/include/opencv2/core/core.hpp
	modules/core/include/opencv2/core/cuda/limits.hpp
	modules/core/include/opencv2/core/internal.hpp
	modules/core/src/matrix.cpp
	modules/nonfree/test/test_features2d.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/src/hog.cpp
	modules/ocl/test/test_haar.cpp
	modules/ocl/test/test_objdetect.cpp
	modules/ocl/test/test_pyrup.cpp
	modules/ts/src/precomp.hpp
	samples/ocl/facedetect.cpp
	samples/ocl/hog.cpp
	samples/ocl/pyrlk_optical_flow.cpp
	samples/ocl/surf_matcher.cpp
 2013-06-25 15:55:52 +04:00
Alexander Smorkalov
91c519467d WinRT build fix for samples and static libs. 2013-06-25 03:36:07 -07:00
Alexander Smorkalov
b0854c605a Windows RT sample improved. 
Corrent histogram output on YUV image implemented;
Some code refactoring done.
 2013-06-25 03:36:05 -07:00
Alexander Smorkalov
bf22567c09 Transform selection implemented in sample GUI. 
Gistogram output does not work propertly due color conversion problems.
 2013-06-25 03:36:04 -07:00
Alexander Smorkalov
de9f659f1e Several transforms added to sample IMFTransform. 2013-06-25 03:36:03 -07:00
Alexander Smorkalov
9e06287121 Windows RT sample updated. 
Unused scenarious removed.
Grey scale convertion replaced with cv::Canny call.
 2013-06-25 03:36:01 -07:00
Alexander Smorkalov
4990336760 Base camera access sample for Windows RT added. 
Microsoft Media Foundation Camera Sample for Windows RT added.
 2013-06-25 03:36:00 -07:00
Vladislav Vinogradov
98bd401534 fix gpu::DeviceInfo compilation under linux 
glibc defines major and minor macros
which conflict with  gpu::DeviceInfo methods with the same name
 2013-06-24 10:11:44 +04:00
Roman Donchenko
eff6dccb3b Merge pull request #1014 from jet47:gpustereo-refactoring 2013-06-21 17:38:36 +04:00
Roman Donchenko
b20c9ad2d1 Merge pull request #1015 from SpecLad:merge-2.4 2013-06-21 17:38:04 +04:00
yao
6326739b44 a bug fix in stereo_match sample 2013-06-21 14:50:08 +08:00
Roman Donchenko
13cd0a0502 Merge remote-tracking branch 'origin/2.4' 
Original pull requests:
	#996 from jet47:gpu-nvcuvid-libraries
	#995 from jet47:fix-bug-2985
	#999 from snosov1:unreliable-results-fix
	#1005 from alekcac:doc_fix
	#1004 from jet47:fix-bug-3068
	#987 from jet47:bug-3085-fix
	#969 from pengx17:2.4_binary_cache
	#929 from dominikrose:mingw-libdc1394-2-windows
	#1000 from ivan-korolev:fix_sift_bug_2892
	#1001 from ivan-korolev:fix_stitching_bug_2405
	#998 from asmorkalov:android_cmake_mips_fix
	#993 from ivan-korolev:fix_videostab_bug_3023
	#988 from snosov1:3071-fix
	#986 from pengx17:2.4_initiated_context
	#982 from pengx17:2.4_fix_two_bugs
	#981 from SeninAndrew:ximea_camera_support_fix
	#991 from asmorkalov:android_javadoc_fix
	#972 from jet47:mog2-params-bug-2168
	#980 from SpecLad:include-config
	#973 from pengx17:2.4_oclclahe
	#903 from aks2:2.4
	#968 from asmorkalov:android_na_cproj_fix
	#971 from SpecLad:matchers-ctor
	#970 from asmorkalov:dshow_valid_check_fix
	#965 from apavlenko:fix_java_empty_mats

Conflicts:
	cmake/OpenCVModule.cmake
	modules/core/src/matmul.cpp
	modules/gpu/CMakeLists.txt
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/perf_imgproc.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/initialization.cpp
	modules/stitching/src/matchers.cpp
	modules/video/src/video_init.cpp
	modules/videostab/src/global_motion.cpp
 2013-06-19 15:25:37 +04:00
yao
f1c549fabf revise ocl samples, add tvl1 sample 2013-06-19 16:36:23 +08:00
Vladislav Vinogradov
be9bb8f18b refactored StereoConstantSpaceBP 2013-06-14 18:17:31 +04:00
Vladislav Vinogradov
d0e89337da refactored StereoBeliefPropagation 2013-06-14 18:17:31 +04:00
Vladislav Vinogradov
dd6d58f873 refactored StereoBM 2013-06-14 18:17:30 +04:00
Vladislav Vinogradov
5720eaf354 refactored Morphology Filters 2013-06-14 17:25:57 +04:00
Vladislav Vinogradov
12ae11e2ff refactored Separable Linear Filters 2013-06-14 17:25:56 +04:00
Vladislav Vinogradov
1eedc6c42a refactored Linear Filter 2013-06-14 17:25:56 +04:00
Roman Donchenko
71db862dc2 Merge pull request #977 from jet47:gpucodec-refactoring 2013-06-14 16:24:24 +04:00
Sergei Nosov
982ef83f80 Fixes bug #3071. 
If we have perfect matches (min_dist == 0.0), then strict comparison
fails. Making it non-strict results in treating perfect matches as
good.
 2013-06-13 11:51:45 +04:00
alexandre benoit
2c1fb5fd71 minor correction after buildbot warnings 2013-06-13 06:55:35 +02:00
alexandre benoit
7bff79bbeb updated demos and tutorial regarding the Retina class transfer to bioinspired module. 2013-06-12 22:43:36 +02:00
alexandre benoit
cdbbe0dfbe 1. created module bioinspired. 2.transfered Retina module into the new module bioinspired. 3. added a fast tone mapping method to Retina interface and wrapped existing reinafilter dedicated method 2013-06-12 22:40:43 +02:00
Vladislav Vinogradov
8fcef225fb switched to Input/Output Array in reductions operations 2013-06-11 17:58:05 +04:00
Vladislav Vinogradov
0c50d0821f switched to Input/Output Array in transpose/flip operations 2013-06-11 17:58:04 +04:00
Vladislav Vinogradov
76211709a3 refactored VideoReader (convert it to abstract interface) 
also refactored VideoSource interface (made it simplier, now it has only 2 abstract methods)
 2013-06-11 17:57:40 +04:00
Vladislav Vinogradov
e9a74c17f8 refactored VideoWriter class (convert it to abstract interface) 2013-06-11 17:57:39 +04:00
Roman Donchenko
7c4e3715b3 Merge pull request #975 from SpecLad:merge-2.4 2013-06-11 17:28:26 +04:00
Roman Donchenko
3bfc69740b Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Merged pull requests:
	#890 from caorong:patch-1
	#893 from jet47:gpu-arm-fixes
	#933 from pengx17:2.4_macfix_cont
	#935 from pengx17:2.4_filter2d_fix
	#936 from bitwangyaoyao:2.4_perf
	#937 from bitwangyaoyao:2.4_fixPyrLK
	#938 from pengx17:2.4_surf_sample
	#939 from pengx17:2.4_getDevice
	#940 from SpecLad:autolock
	#941 from apavlenko:signed_char
	#946 from bitwangyaoyao:2.4_samples2
	#947 from jet47:fix-gpu-arm-build
	#948 from jet47:cuda-5.5-support
	#952 from SpecLad:jepg
	#953 from jet47:fix-bug-3069
	#955 from SpecLad:symlink
	#957 from pengx17:2.4_fix_corner_detector
	#959 from SpecLad:qt4-build
	#960 from SpecLad:extra-modules

Conflicts:
	modules/core/include/opencv2/core/core.hpp
	modules/gpu/CMakeLists.txt
	modules/gpu/include/opencv2/gpu/device/vec_math.hpp
	modules/gpu/perf/perf_video.cpp
	modules/gpuimgproc/src/cuda/hough.cu
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/src/pyrlk.cpp
	samples/gpu/driver_api_multi.cpp
	samples/gpu/driver_api_stereo_multi.cpp
	samples/ocl/surf_matcher.cpp
 2013-06-10 18:18:01 +04:00
Vladislav Vinogradov
2dab93c2e8 refactored gpu info structures (TargetArchs and DeviceInfo) 
now DeviceInfo provides full information about device (from cudaDeviceProp)
 2013-06-10 12:40:32 +04:00
Vladislav Vinogradov
76f4b02b06 refactored gpu::Stream (minor fixes) 2013-06-10 12:40:31 +04:00
Vladislav Vinogradov
4c9773d55f renamed gpu headers (made it more consistent) 2013-06-10 12:40:30 +04:00
Alexander Smorkalov
a39a9f677f NativeActivity sample build with Eclipse CDT fixed. 2013-06-10 11:06:28 +04:00
Vadim Pisarevsky
4cf7a963a0 Merge pull request #946 from bitwangyaoyao:2.4_samples2 2013-06-07 13:44:29 +04:00
Vladislav Vinogradov
3eeaa9189c Revert "Revert "Merge pull request #836 from jet47:gpu-modules"" 2013-06-07 13:05:39 +04:00
caorong
a2adafd508 fix a bug(DetectorType never change) 
changed line281 -> line220
Presentation:
because line 220 give the globle var mDetectorType,and in line 230 it will be compared with mDeteorType !!!  it will never be unequal ~
fix:
change mDetectorType(previous globle var) to a new local val tmpDetectorType
 2013-06-05 15:57:54 +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
5b5815d8cf Merge pull request #893 from jet47:gpu-arm-fixes 2013-06-04 17:52:30 +04:00
yao
f049aa7674 use GoodFeaturesToTrackDetector_OCL 2013-06-04 15:59:21 +08:00
Vladislav Vinogradov
ff28bf831f disabled samples with driver api 2013-06-03 14:01:04 +04:00
peng xiao
cdb16f1120 Fix build error 2013-05-31 17:29:55 +08:00
peng xiao
d85f27b537 Update ocl::surf_matcher sample. 
The new sample adjust some parameters thus it should always be able to
calculate valid homography matrix when input is box.png and
box_in_scene.png.
Pure cpp surf and bfmatcher implementation is also added to show the user
its accuracy and performance.
 2013-05-31 16:06:56 +08:00
Vadim Pisarevsky
6bb9342a5f Merge pull request #918 from bitwangyaoyao:2.4_samples 2013-05-30 12:01:40 +04:00
abidrahmank
2dd3bf116e ANDed waitkey result with 0xFF for x64 systems 2013-05-27 10:30:30 +05:30
abidrahmank
98960bf201 A new python sample on grabcut 2013-05-25 00:55:31 +05:30
yao
fad96b95ad add results verification to facedetect and hog samples 2013-05-24 15:52:33 +08:00
yao
036b0579f1 remove the images in ocl sample folder 2013-05-23 18:12:09 +08:00
yao
33a3a19207 add two samples 2013-05-23 18:10:38 +08: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
Vladislav Vinogradov
49a4f27d42 removed VIBE implementation 2013-05-17 11:27:00 +04:00
Vladislav Vinogradov
ec52096e30 removed VIBE implementation 2013-05-16 13:47:24 +04:00
Vadim Pisarevsky
54afb85d0c Merge pull request #823 from pickle27:starter_image_sequence 2013-05-14 15:56:35 +04:00
Andrey Kamaev
b8ed00bd64 Compile OpenCV with GCC visibility set to hidden 2013-05-13 18:33:20 +04:00
Andrey Kamaev
60059a7aa0 Improve handling of native_app_glue dependency in Android samples 2013-05-13 17:01:18 +04:00
Vadim Pisarevsky
8130d92602 Merge pull request #841 from Pastafarianist:patch-1 2013-05-12 13:00:23 +04:00
Vadim Pisarevsky
f1e8f69d2c Merge pull request #861 from albenoit:master 2013-05-12 12:53:14 +04:00
Andrey Pavlenko
2faa2adae2 Merge pull request #846 from smart-mobile-software:tuto_crash 2013-05-07 15:15:16 +04:00
poiuytrez
7dda8e2cb8 Link to bug tracker replaced by bug description 2013-05-07 11:45:18 +02:00
Pastafarianist
d2116f38fe Fixed typo 2013-05-05 16:17:41 +04:00
poiuytrez
bef6de9025 Fix tuto3 picture taken crash on all devices 
A modification of the JavaCameraView is needed to avoid a crash when the
app is exited. It is a good practice to remove the callback after the
stopPreview method.
 2013-05-01 16:58:15 +02:00
alexandre benoit
9c26387ce0 updated sources to correct buildbot warnings 2013-04-30 17:32:47 +02:00
alexandre benoit
a659e287fb minor error correction 2013-04-30 14:52:14 +02:00
alexandre benoit
72742f5316 resolved conflicts, updated retina class interface and optimized a heavy retinacolor process 2013-04-29 19:06:35 +02:00
alexandre benoit
9549949228 minor chnges for conflict removal 2013-04-29 15:12:44 +02:00
albenoit
9e1ce1ed52 Merge pull request #2 from albenoit/retina_devel 
Retina devel
 2013-04-27 13:47:30 -07:00
alexandre benoit
ea1a64477f updated tutorial with new retina interface use 2013-04-27 22:39:28 +02:00
alexandre benoit
b62d101115 updated retina interface for cleaner use, following OpenCV standards 2013-04-27 21:13:45 +02:00
poiuytrez
60bf018781 Fix android tutorial 3 second picture taken bug 2013-04-24 12:38:15 +02:00
Kevin Hughes
69c626e720 starter_video.cpp hid local functions 2013-04-22 22:28:35 -04:00
Kevin Hughes
3441b2df65 starter_video.cpp changed CV WINDOW KEEPRATIO to just WINDOW KEEPTATIO to fix build error 2013-04-22 16:35:23 -04:00
Pastafarianist
28427ce2e8 Fixed typo 2013-04-21 23:04:54 +04:00
Andrey Kamaev
416fb50594 Revert "Merge pull request #836 from jet47:gpu-modules" 
This reverts commit fba72cb60d, reversing
changes made to 02131ffb62.
 2013-04-18 15:03:50 +04:00
Vladislav Vinogradov
564f609885 fixed samples compilation 2013-04-18 13:28:34 +04:00
Vladislav Vinogradov
787e56ab5c disabled gpucodec module on MacOS 2013-04-18 13:28:34 +04:00
Vladislav Vinogradov
5ee9d3111d fixed gpu tutorial 2013-04-18 13:28:34 +04:00
Vladislav Vinogradov
13d087e62d videostab module fixes 2013-04-18 13:28:34 +04:00
Vladislav Vinogradov
fdeec6896c stitching module fixes 2013-04-18 13:28:30 +04:00
Vladislav Vinogradov
ac0f506d0e split gpuvideo onto gpuoptflow and gpubgsegm 2013-04-18 11:33:34 +04:00
Vladislav Vinogradov
eda124ec32 removed gpuobjdetect module 2013-04-18 11:33:33 +04:00
Vladislav Vinogradov
28b1caa730 gpustereo module for stereo correspondence 2013-04-18 11:33:33 +04:00
Vladislav Vinogradov
fc3730fcc2 gpuwarping module for image warping 2013-04-18 11:33:33 +04:00
Vladislav Vinogradov
508fb6aa5b renamed gpunvidia -> gpulegacy 2013-04-18 11:33:33 +04:00
Vladislav Vinogradov
a6648b5372 gpuobjdetect module for object detection 2013-04-18 11:33:32 +04:00
Vladislav Vinogradov
b08b9ab83b gpucalib3d module for camera calibration and stereo correspondence 2013-04-18 11:33:32 +04:00
Vladislav Vinogradov
fc1fa28556 gpuvideo module for video processing 2013-04-18 11:33:32 +04:00
Vladislav Vinogradov
7544ddbfef gpufeatures2d module 2d for feature detection and matching 2013-04-18 11:33:31 +04:00
Vladislav Vinogradov
e41aea0acf gpuimgproc module for image processing 2013-04-18 11:33:31 +04:00
Vladislav Vinogradov
229ca0914a gpunvidia module for NCV & NPP API 2013-04-18 11:33:30 +04:00
Vladislav Vinogradov
84de6ce036 gpufilters module for image filtering 2013-04-18 11:33:30 +04:00
Vladislav Vinogradov
31c8b527c6 gpuarithm module for arithmetics operations on matrices 2013-04-18 11:33:30 +04:00
Vladislav Vinogradov
1b00a3ed54 gpucodec module for video decoding/encoding 2013-04-18 11:33:29 +04:00
Kevin Hughes
47c84335f0 removed starter_image_sequence.cpp 2013-04-17 13:22:37 -04:00
Kevin Hughes
eedb6fa3c4 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 2013-04-17 13:20:32 -04:00
Vladislav Vinogradov
54e7c76d99 fixed compilation errors 2013-04-17 15:24:53 +04:00
Andrey Pavlenko
8c40f0ccf2 fixing build and lint warnings 2013-04-16 15:30:43 +04:00
Andrey Kamaev
8f32902ce6 Minimize usages of legacy C API inside the library 2013-04-16 12:00:02 +04:00
Kevin Hughes
b141762070 added an example of using cv::VideoCapture to read image sequences like 000.pmg, 001.png ... 100.png etc. 2013-04-15 13:21:20 -04:00
Andrey Kamaev
f886651cf0 Drop old python samples and tests 2013-04-12 19:37:40 +04:00
Andrey Kamaev
909d6fcf51 Move legacy part of opencv_contrib to separate header 2013-04-12 19:37:40 +04:00
Andrey Kamaev
3b364330ad Merge branch '2.4' 2013-04-12 15:35:38 +04:00
Andrey Kamaev
abe2ea59ed Merge pull request #802 from SpecLad:shebang 2013-04-12 15:00:28 +04:00
Andrey Kamaev
8406312571 Remove C API from OpenCL module 2013-04-12 14:37:02 +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
e5a33723fc Move C API of opencv_calib3d to separate file 2013-04-11 21:00:17 +04:00
Roman Donchenko
57d4c86b2b Fixed the shebang lines on the Python scripts. 
Also, removed the one from modules/python/src2/cv.py and cleared its
executable bit, since it's not a script.
 2013-04-11 18:37:23 +04:00
Kirill Kornyakov
53a06913cb Minor code cleanings in lkdemo.cpp 2013-04-11 17:57:33 +04:00
Kirill Kornyakov
e351538697 #2813 bugfix 2013-04-11 17:50:10 +04:00
Andrey Kamaev
199a35a105 Move C API of opencv_video to separate file 2013-04-11 17:38:33 +04:00
Andrey Kamaev
7711fe2f43 Merge pull request #794 from asmorkalov:android_no_layout 2013-04-11 11:34:42 +04:00
Andrey Kamaev
c98c246fc2 Move border type constants and Moments class to core module 2013-04-10 19:14:24 +04:00
Alexander Smorkalov
82c61eba49 Feature #2893 Create Java sample without layout.xml implemented. 2013-04-10 13:38:59 +04:00
Andrey Kamaev
71896544ca Merge pull request #789 from asmorkalov:android_na_mk_fix 2013-04-09 13:14:22 +04:00
Vladislav Vinogradov
ba1a1aecaa fixed gpu module compilation 2013-04-09 10:41:35 +04:00
Alexander Smorkalov
7bd169caa9 Native activity build with Android.mk fixed. 2013-04-09 10:17:22 +04:00
Andrey Kamaev
dd74a851f3 Fix build errors 2013-04-08 17:10:31 +04:00
Andrey Kamaev
69648f0a6f Make photo.hpp independent from C API 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
Andrey Kamaev
6ef43cd96e Merge pull request #779 from sivapvarma:master 2013-04-08 10:11:33 +04:00
Andrey Kamaev
5cfb6a848e Merge pull request #780 from sivapvarma:2.4 2013-04-08 10:11:16 +04:00
Andrey Kamaev
67073daf19 Merge branch '2.4' 2013-04-05 21:11:59 +04:00
Siva Prasad Varma
e2df8c7e62 Fix bug #2590 
replaced wrong check to correct check
 2013-04-05 19:09:09 +05:30
Siva Prasad Varma
3b0ce8e132 Add HoughTransform examples python2 
houghlines.py for HoughLinesP() and HoughLines()
houghcircles.py for HoughCircles()
 2013-04-05 14:32:07 +05:30
Alexander Smorkalov
f89cc191a4 Waning fixes for Android samples 2013-04-05 12:17:45 +04:00
Alexander Shishkov
35f75147b0 removed willowgarage.com links 2013-04-04 14:33:00 +04:00
Alexander Shishkov
382695ba5a removed links to the http://opencv.willowgarage.com/ 2013-04-04 13:44:28 +04:00
Alexander Smorkalov
3929a43873 Native activity install fixed. 2013-04-03 14:43:23 +04:00
Andrey Kamaev
c979de1eed Rewrite Mat formatting without std streams 2013-04-03 11:55:19 +04:00
Vladislav Vinogradov
9086efa8e9 fixed warnings 2013-04-02 13:24:00 +04: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
71e43852ce Fix MSVC build issues 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
5e7ab8baf3 Move cv::Scalar_ to types.hpp 2013-04-01 15:24:33 +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
2a1cf23fab Merge pull request #713 from bitwangyaoyao:2.4_perf 2013-04-01 15:16:48 +04:00
Alexander Smorkalov
f2fe89c6d8 CMakeLists.txt for Android native activity added. 2013-04-01 12:38:26 +04:00
Dustin Spicuzza
b08432cfe7 Port dft.py sample from cv to cv2 2013-03-29 17:37:00 -04:00
Andrey Kamaev
f77a375354 Merge branch '2.4' 2013-03-29 19:38:35 +04:00
yao
5539e85a11 use perf test replace performance sample 2013-03-27 12:04:48 +08:00
Andrey Kamaev
20534c9beb Merge pull request #692 from vpisarev:refactor_calib3d_stereo 2013-03-26 18:38:16 +04:00
Andrey Kamaev
f282498b1d Drop outdated targets and fix solution folders 2013-03-25 21:57:53 +04:00
Andrey Kamaev
29cfeb7cee Fix build of apps and samples 2013-03-22 22:14:36 +04:00
Andrey Kamaev
82d7292ee7 Merge pull request #680 from vpisarev:c2cpp_video_take2 2013-03-22 19:34:53 +04:00
Vadim Pisarevsky
7661625c39 converter stereo correspondence algorithms to the new style 2013-03-22 01:05:30 +04:00
Andrey Kamaev
1ca8f33b4e Merge branch '2.4' 2013-03-21 23:11:54 +04:00
Andrey Kamaev
1b4afcca30 Move OpenCl SURF perf tests to nonfree and fix build of samples 2013-03-21 18:19:52 +04:00
Andrey Kamaev
40c26e21d2 Merge pull request #662 from asmorkalov:android_native_activity 2013-03-21 14:47:14 +04:00
Vadim Pisarevsky
321070ccf0 Merge pull request #669 from vpisarev:fast_lin_svm 2013-03-21 12:22:36 +04:00
Vadim Pisarevsky
07e0f7bf59 refactored video module; use the new-style algorithms now 2013-03-20 19:51:49 +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
Vadim Pisarevsky
24c614f686 added load/save feature for SVM classifier in letter_recog sample 2013-03-19 18:41:38 +04:00
Vadim Pisarevsky
a06af5ca25 dramatic speedup of SVM::predict in the case of linear SVM 2013-03-19 18:28:17 +04:00
Alexander Smorkalov
b37d65ff2b Code refactoring was done. 2013-03-18 17:36:48 +04:00
Vladislav Vinogradov
0a65f2f4af merged gpunonfree and nonfree module 2013-03-18 16:14:37 +04:00
cuda-geek
3f8d87d82c Merge pull request #661 from cuda-geek:merge-cpu-gpu-detections 2013-03-18 15:34:02 +04:00
Vladislav Vinogradov
fd7bf0b766 moved SURF_GPU and VIBE to gpunonfree module 2013-03-18 14:06:29 +04:00
Alexander Smorkalov
dc2bca0772 Initialization with Manager instead static link added. 2013-03-18 10:37:11 +04:00
Alexander Smorkalov
436d9bbcbb Base for Native Activity example added. 2013-03-18 10:37:11 +04:00
marina.kolpakova
0211843062 merge Detection structure for CPU and GPU soft cascade detectors 2013-03-18 06:58:53 +04:00
cuda-geek
819ac111a2 Merge pull request #660 from Nerei:2.4 2013-03-17 23:00:04 +04:00
Vadim Pisarevsky
959a5c980d Merge pull request #532 from jet47:super-resolution 2013-03-17 19:13:37 +04:00
Anatoly Baksheev
2bf3104ee5 bugfix in sample to support LBP classifier. To merge to master also. 2013-03-17 18:43:55 +04:00
Andrey Kamaev
e75df56317 Unified handling of InputOutputArrays in Python wrapper generator 
This makes arguments of type InputOutputArray required in python unless they
have a default value in C++.

As result following python functions changes signatures in non-trivial way:

* calcOpticalFlowFarneback
* calcOpticalFlowPyrLK
* calibrateCamera
* findContours
* findTransformECC
* floodFill
* kmeans
* PCACompute
* stereoCalibrate

And the following functions become return their modified inputs as a return
value:

* accumulate
* accumulateProduct
* accumulateSquare
* accumulateWeighted
* circle
* completeSymm
* cornerSubPix
* drawChessboardCorners
* drawContours
* drawDataMatrixCodes
* ellipse
* fillConvexPoly
* fillPoly
* filterSpeckles
* grabCut
* insertChannel
* line
* patchNaNs
* polylines
* randn
* randShuffle
* randu
* rectangle
* setIdentity
* updateMotionHistory
* validateDisparity
* watershed
 2013-03-15 17:44:49 +04:00
Andrey Kamaev
a1c456b7c3 Extract common base header for C and C++ APIs 2013-03-15 10:38:38 +04:00
Andrey Kamaev
18ca645fd2 Merge pull request #631 from bitwangyaoyao:2.4_stereo 2013-03-15 10:34:27 +04:00
marina.kolpakova
157a98edf7 refactored cuda error handling; remove optional dependancies in soft cascade training app 2013-03-14 23:43:03 +04:00
marina.kolpakova
a476664144 fixed compilation with latest master changes 2013-03-14 20:12:52 +04:00
marina.kolpakova
5120322cea move gpu version of soft cascade to dedicated module 2013-03-14 12:27:13 +04:00
Andrey Kamaev
d9cd753835 Merge pull request #645 from taka-no-me:bump_headers 2013-03-14 11:42:23 +04:00
Andrey Kamaev
7d0938d481 Merge pull request #640 from cuda-geek:soft-cascade-sample 2013-03-14 11:41:17 +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