From 190b99c96b1c5cc3d5db2dc4c7f371416346e8d2 Mon Sep 17 00:00:00 2001 From: Robert Eisele Date: Thu, 17 Jul 2014 15:11:28 +0200 Subject: [PATCH] Changed license --- LICENSE | 24 ++++++++++++++++++++++++ facedetect.c | 13 +++++-------- php_facedetect.h | 8 ++++---- 3 files changed, 33 insertions(+), 12 deletions(-) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..d8662fc --- /dev/null +++ b/LICENSE @@ -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 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 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. \ No newline at end of file diff --git a/facedetect.c b/facedetect.c index ab49c9d..8614d5b 100644 --- a/facedetect.c +++ b/facedetect.c @@ -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 | +----------------------------------------------------------------------+ */ -// 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 diff --git a/php_facedetect.h b/php_facedetect.h index 171006e..95d598d 100644 --- a/php_facedetect.h +++ b/php_facedetect.h @@ -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 | +----------------------------------------------------------------------+