Skip to content

Commit

Permalink
Changed license
Browse files Browse the repository at this point in the history
  • Loading branch information
infusion committed Jul 17, 2014
1 parent 680c815 commit 190b99c
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 12 deletions.
24 changes: 24 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
Copyright (c) 2009, Robert Eisele
All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
* Neither the name of the <organization> nor the
names of its contributors may be used to endorse or promote products
derived from this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
13 changes: 5 additions & 8 deletions facedetect.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,18 @@
+----------------------------------------------------------------------+
| PHP Version 5 |
+----------------------------------------------------------------------+
| This source file is subject to version 3.0 of the PHP license, |
| This source file is subject to BSD 3-Clause license, |
| that is bundled with this package in the file LICENSE, and is |
| available through the world-wide-web at the following url: |
| http://www.php.net/license/3_0.txt. |
| If you did not receive a copy of the PHP license and are unable to |
| http://opensource.org/licenses/BSD-3-Clause. |
| If you did not receive a copy of the BSD license and are unable to |
| obtain it through the world-wide-web, please send a note to |
| license@php.net so we can mail you a copy immediately. |
| robert@xarg.org so we can mail you a copy immediately. |
+----------------------------------------------------------------------+
| Author: Robert Eisele <robert@xarg.org> |
+----------------------------------------------------------------------+
*/
// http://www.santyago.pl/files/facedetect-1.0.1-opencv-2.2.0.patch
// - face recog lib embedden http://libface.sourceforge.net/file/Examples.html
// - http://www.cognotics.com/opencv/servo_2007_series/part_5/index.html
// - opencv 2.2 kompatibel

#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
Expand Down
8 changes: 4 additions & 4 deletions php_facedetect.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
+----------------------------------------------------------------------+
| PHP Version 5 |
+----------------------------------------------------------------------+
| This source file is subject to version 3.0 of the PHP license, |
| This source file is subject to BSD 3-Clause license, |
| that is bundled with this package in the file LICENSE, and is |
| available through the world-wide-web at the following url: |
| http://www.php.net/license/3_0.txt. |
| If you did not receive a copy of the PHP license and are unable to |
| http://opensource.org/licenses/BSD-3-Clause. |
| If you did not receive a copy of the BSD license and are unable to |
| obtain it through the world-wide-web, please send a note to |
| license@php.net so we can mail you a copy immediately. |
| robert@xarg.org so we can mail you a copy immediately. |
+----------------------------------------------------------------------+
| Author: Robert Eisele <robert@xarg.org> |
+----------------------------------------------------------------------+
Expand Down

0 comments on commit 190b99c

Please sign in to comment.