| Index: third_party/libjpeg_turbo/LICENSE.txt
|
| ===================================================================
|
| --- third_party/libjpeg_turbo/LICENSE.txt (revision 95773)
|
| +++ third_party/libjpeg_turbo/LICENSE.txt (working copy)
|
| @@ -1,53 +1,27 @@
|
| - wxWindows Library Licence, Version 3.1
|
| - ======================================
|
| +libjpeg-turbo is licensed under a non-restrictive, BSD-style license
|
| +(see README.) The TurboJPEG/OSS wrapper (both C and Java versions) and
|
| +associated test programs bear a similar license, which is reproduced below:
|
|
|
| - Copyright (C) 1998-2005 Julian Smart, Robert Roebling et al
|
| +Redistribution and use in source and binary forms, with or without
|
| +modification, are permitted provided that the following conditions are met:
|
|
|
| - Everyone is permitted to copy and distribute verbatim copies
|
| - of this licence document, but changing it is not allowed.
|
| +- 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 libjpeg-turbo Project nor the names of its
|
| + contributors may be used to endorse or promote products derived from this
|
| + software without specific prior written permission.
|
|
|
| - WXWINDOWS LIBRARY LICENCE
|
| - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
|
| -
|
| - This library is free software; you can redistribute it and/or modify it
|
| - under the terms of the GNU Library General Public Licence as published by
|
| - the Free Software Foundation; either version 2 of the Licence, or (at
|
| - your option) any later version.
|
| -
|
| - This library is distributed in the hope that it will be useful, but
|
| - WITHOUT ANY WARRANTY; without even the implied warranty of
|
| - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library
|
| - General Public Licence for more details.
|
| -
|
| - You should have received a copy of the GNU Library General Public Licence
|
| - along with this software, usually in a file named COPYING.LIB. If not,
|
| - write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
|
| - Boston, MA 02111-1307 USA.
|
| -
|
| - EXCEPTION NOTICE
|
| -
|
| - 1. As a special exception, the copyright holders of this library give
|
| - permission for additional uses of the text contained in this release of
|
| - the library as licenced under the wxWindows Library Licence, applying
|
| - either version 3.1 of the Licence, or (at your option) any later version of
|
| - the Licence as published by the copyright holders of version
|
| - 3.1 of the Licence document.
|
| -
|
| - 2. The exception is that you may use, copy, link, modify and distribute
|
| - under your own terms, binary object code versions of works based
|
| - on the Library.
|
| -
|
| - 3. If you copy code from files distributed under the terms of the GNU
|
| - General Public Licence or the GNU Library General Public Licence into a
|
| - copy of this library, as this licence permits, the exception does not
|
| - apply to the code that you add in this way. To avoid misleading anyone as
|
| - to the status of such modified files, you must delete this exception
|
| - notice from such code and/or adjust the licensing conditions notice
|
| - accordingly.
|
| -
|
| - 4. If you write modifications of your own for this library, it is your
|
| - choice whether to permit this exception to apply to your modifications.
|
| - If you do not wish that, you must delete the exception notice from such
|
| - code and/or adjust the licensing conditions notice accordingly.
|
| -
|
| -
|
| +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 HOLDERS 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.
|
|
|