From 2bd7407465fc660d5b853f71be1012905d8c896b Mon Sep 17 00:00:00 2001
From: Andreas Gohr <gohr@cosmocode.de>
Date: Tue, 22 Jun 2010 13:16:37 +0200
Subject: [PATCH] License change for inc/JpegMeta.php
Original author Sebastian Delmont agreed to rerelease the code
under BSD license to avoid license compatibility problems.
Other authors (me and Hakan Sandell) agreed as well.
---
inc/JpegMeta.php | 50 +++++++++++++++++++++++++++++-------------------
1 file changed, 30 insertions(+), 20 deletions(-)
diff --git a/inc/JpegMeta.php b/inc/JpegMeta.php
index b06764320..98453131e 100644
--- a/inc/JpegMeta.php
+++ b/inc/JpegMeta.php
@@ -2,32 +2,42 @@
/**
* JPEG metadata reader/writer
*
- * @license PHP license 2.0 (http://www.php.net/license/2_02.txt)
- * @link http://www.zonageek.com/software/php/jpeg/index.php
+ * @license BSD <http://www.opensource.org/licenses/bsd-license.php>
+ * @link http://github.com/sd/jpeg-php
* @author Sebastian Delmont <sdelmont@zonageek.com>
* @author Andreas Gohr <andi@splitbrain.org>
- * @author Hakan Sandell <hakan.sandell@mydata.se>
+ * @author Hakan Sandell <hakan.sandell@mydata.se>
* @todo Add support for Maker Notes, Extend for GIF and PNG metadata
*/
-// This class is a modified and enhanced version of the JPEG class by
-// Sebastian Delmont. Original Copyright notice follows:
+// Original copyright notice:
//
-// +----------------------------------------------------------------------+
-// | PHP version 4.0 |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1997, 1998, 1999, 2000, 2001 The PHP Group |
-// +----------------------------------------------------------------------+
-// | This source file is subject to version 2.0 of the PHP license, |
-// | that is bundled with this package in the file LICENSE, and is |
-// | available at through the world-wide-web at |
-// | http://www.php.net/license/2_02.txt. |
-// | If you did not receive a copy of the PHP 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. |
-// +----------------------------------------------------------------------+
-// | Authors: Sebastian Delmont <sdelmont@zonageek.com> |
-// +----------------------------------------------------------------------+
+// Copyright (c) 2003 Sebastian Delmont <sdelmont@zonageek.com>
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// 1. Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+// 2. 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.
+// 3. Neither the name of the author 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 THE COPYRIGHT
+// HOLDER OR CONTRIBUTORS 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
class JpegMeta {
var $_fileName;
--
GitLab