From ae7fe0b9ab2055538cb485c11e1f1b52f37b6253 Mon Sep 17 00:00:00 2001 From: DRC Date: Wed, 11 Aug 2010 21:46:46 +0000 Subject: [PATCH] Clarify licensing git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/trunk@226 632fc199-4ca6-4c93-a231-07263d6284db --- README-turbo.txt | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/README-turbo.txt b/README-turbo.txt index d87450d..40350d0 100755 --- a/README-turbo.txt +++ b/README-turbo.txt @@ -25,16 +25,21 @@ libraries can be used as drop-in replacements for libjpeg on most systems. ** License ******************************************************************************* -Some of the optimizations to the Huffman encoder/decoder were borrowed from -VirtualGL, and thus the libjpeg-turbo distribution, as a whole, falls under 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 these modifications, falls under a less -restrictive, BSD-style license (see README.) +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 optimizations 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 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 +replacing the optimized jchuff.c and jdhuff.c with their unoptimized +counterparts from the libjpeg v6b source. ******************************************************************************* -- 2.40.0