ryan/mozjpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clarify licensing

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/trunk@226 632fc199-4ca6-4c93-a231-07263d6284db
This commit is contained in:
DRC
2010-08-11 21:46:46 +00:00
parent 025a279ce6
commit ae7fe0b9ab
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
README-turbo.txt
View File

@@ -25,16 +25,21 @@ libraries can be used as drop-in replacements for libjpeg on most systems.
** License ** License
******************************************************************************* *******************************************************************************
Some of the optimizations to the Huffman encoder/decoder were borrowed from Some of the optimizations to the Huffman encoder (jchuff.c) and decoder
VirtualGL, and thus the libjpeg-turbo distribution, as a whole, falls under the (jdhuff.c) were borrowed from VirtualGL, and thus any distribution of
wxWindows Library Licence, Version 3.1. A copy of this license can be found in libjpeg-turbo which includes those optimizations must, as a whole, be subject
this directory under LICENSE.txt. The wxWindows Library License is based on to the terms of the wxWindows Library Licence, Version 3.1. A copy of this
the LGPL but includes provisions which allow the Library to be statically license can be found in this directory under LICENSE.txt. The wxWindows
linked into proprietary libraries and applications without requiring the Library License is based on the LGPL but includes provisions which allow the
resulting binaries to be distributed under the terms of the LGPL. 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 The rest of the source code, apart from the Huffman codec optimizations, falls
restrictive, BSD-style license (see README.) 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.
******************************************************************************* *******************************************************************************