9ed475cf52
War on Whitespace, master edition: file endings.
2013-08-27 14:23:26 +04:00
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
3c137f7a04
Converted tabs to spaces.
2013-08-21 18:59:26 +04:00
e9a28f66ee
Normalized file endings.
2013-08-21 18:59:25 +04:00
f55740da70
Deleted all trailing whitespace.
2013-08-21 18:59:24 +04:00
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
21641d04a7
Fixed mismatching allocation and deallocation: el_ptr
2013-08-14 23:36:29 +10:00
b8ed00bd64
Compile OpenCV with GCC visibility set to hidden
2013-05-13 18:33:20 +04:00
909d6fcf51
Move legacy part of opencv_contrib to separate header
2013-04-12 19:37:40 +04:00
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
199a35a105
Move C API of opencv_video to separate file
2013-04-11 17:38:33 +04:00
0738ea7d0f
Make highgui.hpp independent from C API
2013-04-08 15:47:29 +04:00
288a0634c2
Make imgproc.hpp independent from C API
2013-04-08 15:47:28 +04:00
715fa3303e
Move cv::Mat out of core.hpp
2013-04-01 15:24:34 +04:00
5e7ab8baf3
Move cv::Scalar_ to types.hpp
2013-04-01 15:24:33 +04:00
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
89356ff16d
Move non-CV functionality from core.hpp to separate utility.hpp header
2013-03-20 17:56:06 +04:00
9e12b7c3c2
Merge release 2.4.4
2013-03-04 19:43:49 +04:00
22d33373fa
Fix build warnings on MSVC x64 and OS X clang
2013-03-01 13:29:43 +04:00
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
07ea88b8c6
Update samples/c/smiledetect.cpp
...
Fixed isdigit() Android build error
2013-02-22 16:23:42 +01:00
8cfba6456b
Update samples/c/smiledetect.cpp
...
- Changed to floating neighbor maximum mode
- Fixed some previous errors.
2013-02-21 22:55:28 +01:00
379dcf87d5
Added smile detector
2013-02-21 17:17:34 +01:00
f4e27bcbbc
Merge branch '2.4'
2013-01-25 16:30:36 +04:00
9f417268b3
Fixed visualization by choosing the color appropriate to the detection
...
Fixed visualization by choosing the color appropriate to the detection
score.
Previously the example showed all detections with the same color
disregarding the confidence. This led to the impression that the object
detection did not work at all because there are many detections with low
confidences.
PR to master was
https://github.com/Itseez/opencv/pull/320
2013-01-24 10:01:18 +01:00
13b6a3a15e
Merge branch 2.4
2012-12-24 17:10:07 +04:00
9944282b09
Fix build with STLPort from NDK r8d
2012-12-22 00:59:56 +04:00
9719ea93b6
Merge branch 2.4
2012-11-13 19:54:48 +04:00
dad56e202f
Rename sample & tutorial executables
2012-11-09 10:15:48 +04:00
0e7ca71dcc
Normalize whitespace in documentation and text files
2012-10-17 21:42:09 +04:00
81f826db2b
Normalize line endings and whitespace
2012-10-17 15:57:49 +04:00
04384a71e4
Normalize line endings and whitespace
2012-10-17 15:32:23 +04:00
d566c6bc86
Revert "add new version of CommandLineParser. add empty docs"
...
This reverts commit 54a202b3d5
2012-10-15 20:01:44 +04:00
54a202b3d5
add new version of CommandLineParser. add empty docs
2012-09-07 13:24:48 +04:00
bbf679267a
modified facedetect to properly display very oblong objects and optionally flip image horizontally (for profile face detection). Added LBP cascades by Attila Novak for profile face detection and silverware detection (those are results of GSoC 2012)
2012-08-22 15:48:57 +04:00
a323da6fd5
Fixed some warnings and install problems on linux
2012-06-27 12:02:31 +00:00
988c405f79
Fixed build with MSVC
2012-06-20 16:03:03 +00:00
d48d7b2b46
Updated warning options for GCC; fixed new warnings.
2012-06-20 12:27:02 +00:00
c5aba337e9
Fixed number of warnings. Fixed mingw64 build.
2012-06-12 14:46:12 +00:00
f62028dc16
Fixed mingw build.
2012-06-08 03:15:08 +00:00
49a1ba6038
Set stricter warning rules for gcc
2012-06-07 17:21:29 +00:00
eb90882b2d
Fixed some build warnings
2012-05-25 13:13:51 +00:00
2fd1e2ea57
merged all the latest changes from 2.4 to trunk
2012-04-13 21:50:59 +00:00
0d18d19ad6
Fixed Android build warnings
2012-03-30 16:10:52 +00:00
68d20301f2
fixed building delaunay.c with MSVC
2012-03-30 12:54:54 +00:00
beb7fc3c92
a LOT of obsolete stuff has been moved to the legacy module.
2012-03-30 12:19:25 +00:00
648669cb81
preliminary version of a multi-level findcontours
2012-03-24 20:07:10 +00:00
846e37ded5
fixed many warnings from GCC 4.6.1
2012-03-17 09:22:31 +00:00
4985c1b632
fixed hundreds of warnings from MSVC 2010.
2012-03-16 21:21:04 +00:00
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
Roman Donchenko