From: DRC Date: Mon, 18 Apr 2011 07:01:46 +0000 (+0000) Subject: git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/trunk@591 632fc199-4ca6... X-Git-Tag: 1.1.90~105 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1f8b6010eaf0ea1cfb1ed9111e77e19d79a446ca;p=libjpeg-turbo git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/trunk@591 632fc199-4ca6-4c93-a231-07263d6284db --- diff --git a/README-turbo.txt b/README-turbo.txt index fec34e0..9e4e46e 100755 --- a/README-turbo.txt +++ b/README-turbo.txt @@ -27,20 +27,19 @@ libraries can be used as drop-in replacements for libjpeg on most systems. ******************************************************************************* The TurboJPEG/OSS wrapper, as well as some of the optimizations to the Huffman -encoder (jchuff.c) and decoder (jdhuff.c), were borrowed from VirtualGL, and -thus any distribution of libjpeg-turbo which includes those files must, as a -whole, be subject to the terms of the wxWindows Library Licence, Version 3.1. -A copy of this license can be found in this directory under LICENSE.txt. The -wxWindows Library License is based on the LGPL but includes provisions which -allow the Library to be statically linked into proprietary libraries and -applications without requiring the resulting binaries to be distributed under -the terms of the LGPL. +encoder (jchuff.c), were borrowed from VirtualGL, and thus any distribution of +libjpeg-turbo which includes those files must, as a whole, be subject to the +terms of the wxWindows Library Licence, Version 3.1. A copy of this license +can be found in this directory under LICENSE.txt. The wxWindows Library +License is based on the LGPL but includes provisions which allow the Library to +be statically linked into proprietary libraries and applications without +requiring the resulting binaries to be distributed under the terms of the LGPL. The rest of the source code, apart from TurboJPEG/OSS and the Huffman codec optimizations, falls under a less restrictive, BSD-style license (see README.) You can choose to distribute libjpeg-turbo, as a whole, under this BSD-style license by simply removing TurboJPEG/OSS and replacing the optimized jchuff.c -and jdhuff.c with their unoptimized counterparts from the libjpeg v6b source. +with its unoptimized counterpart from the libjpeg v6b source. *******************************************************************************