Skip to content

Commit 76678bc

Browse files
committed
Merge pull request #2 from Itseez/master
Update 2
2 parents 831523c + eada220 commit 76678bc

File tree

1,159 files changed

+450479
-10522
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,159 files changed

+450479
-10522
lines changed

CONTRIBUTING.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
## Contributing guidelines
2+
3+
All guidelines for contributing to the OpenCV repository can be found at [`How to contribute guideline`](https://github.com/Itseez/opencv/wiki/How_to_contribute).

LICENSE

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
By downloading, copying, installing or using the software you agree to this license.
2+
If you do not agree to this license, do not download, install,
3+
copy or use the software.
4+
5+
6+
License Agreement
7+
For Open Source Computer Vision Library
8+
(3-clause BSD License)
9+
10+
Copyright (C) 2000-2015, Intel Corporation, all rights reserved.
11+
Copyright (C) 2009-2011, Willow Garage Inc., all rights reserved.
12+
Copyright (C) 2009-2015, NVIDIA Corporation, all rights reserved.
13+
Copyright (C) 2010-2013, Advanced Micro Devices, Inc., all rights reserved.
14+
Copyright (C) 2015, OpenCV Foundation, all rights reserved.
15+
Copyright (C) 2015, Itseez Inc., all rights reserved.
16+
Third party copyrights are property of their respective owners.
17+
18+
Redistribution and use in source and binary forms, with or without modification,
19+
are permitted provided that the following conditions are met:
20+
21+
* Redistributions of source code must retain the above copyright notice,
22+
this list of conditions and the following disclaimer.
23+
24+
* Redistributions in binary form must reproduce the above copyright notice,
25+
this list of conditions and the following disclaimer in the documentation
26+
and/or other materials provided with the distribution.
27+
28+
* Neither the names of the copyright holders nor the names of the contributors
29+
may be used to endorse or promote products derived from this software
30+
without specific prior written permission.
31+
32+
This software is provided by the copyright holders and contributors "as is" and
33+
any express or implied warranties, including, but not limited to, the implied
34+
warranties of merchantability and fitness for a particular purpose are disclaimed.
35+
In no event shall copyright holders or contributors be liable for any direct,
36+
indirect, incidental, special, exemplary, or consequential damages
37+
(including, but not limited to, procurement of substitute goods or services;
38+
loss of use, data, or profits; or business interruption) however caused
39+
and on any theory of liability, whether in contract, strict liability,
40+
or tort (including negligence or otherwise) arising in any way out of
41+
the use of this software, even if advised of the possibility of such damage.
42+

modules/README.md

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ $ cmake -D OPENCV_EXTRA_MODULES_PATH=<opencv_contrib>/modules -D BUILD_opencv_re
2222

2323
7. **opencv_datasettools**: Tools for working with different datasets.
2424

25-
8. **opencv_face**: Recently added face recognition software which is not yet stabalized.
25+
8. **opencv_face**: Recently added face recognition software which is not yet stabilized.
2626

2727
9. **opencv_latentsvm**: Implementation of the LatentSVM detector algorithm.
2828

@@ -47,7 +47,13 @@ $ cmake -D OPENCV_EXTRA_MODULES_PATH=<opencv_contrib>/modules -D BUILD_opencv_re
4747
19. **opencv_xfeatures2d**: Extra 2D Features Framework containing experimental and non-free 2D feature algorithms.
4848

4949
20. **opencv_ximgproc**: Extended Image Processing: Structured Forests / Domain Transform Filter / Guided Filter / Adaptive Manifold Filter / Joint Bilateral Filter / Superpixels.
50-
50+
5151
21. **opencv_xobjdetect**: Integral Channel Features Detector Framework.
5252

5353
22. **opencv_xphoto**: Additional photo processing algorithms: Color balance / Denoising / Inpainting.
54+
55+
23. **opencv_stereo**: Stereo Correspondence done with different descriptors: Census / CS-Census / MCT / BRIEF / MV.
56+
57+
24. **opencv_hdf**: Hierarchical Data Format I/O.
58+
59+
25. **opencv_fuzzy**: New module focused on the fuzzy image processing.

modules/adas/CMakeLists.txt

Lines changed: 0 additions & 8 deletions
This file was deleted.

modules/adas/README.md

Lines changed: 0 additions & 2 deletions
This file was deleted.

modules/adas/tools/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
This file was deleted.

modules/adas/tools/fcw_detect/CMakeLists.txt

Lines changed: 0 additions & 35 deletions
This file was deleted.

modules/adas/tools/fcw_detect/fcw_detect.cpp

Lines changed: 0 additions & 132 deletions
This file was deleted.

0 commit comments

Comments
 (0)