This commit is contained in:
@@ -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
|
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
|
encoder (jchuff.c), were borrowed from VirtualGL, and thus any distribution of
|
||||||
thus any distribution of libjpeg-turbo which includes those files must, as a
|
libjpeg-turbo which includes those files must, as a whole, be subject to the
|
||||||
whole, be subject to the terms of the wxWindows Library Licence, Version 3.1.
|
terms of the wxWindows Library Licence, Version 3.1. A copy of this license
|
||||||
A copy of this license can be found in this directory under LICENSE.txt. The
|
can be found in this directory under LICENSE.txt. The wxWindows Library
|
||||||
wxWindows Library License is based on the LGPL but includes provisions which
|
License is based on the LGPL but includes provisions which allow the Library to
|
||||||
allow the Library to be statically linked into proprietary libraries and
|
be statically linked into proprietary libraries and applications without
|
||||||
applications without requiring the resulting binaries to be distributed under
|
requiring the resulting binaries to be distributed under the terms of the LGPL.
|
||||||
the terms of the LGPL.
|
|
||||||
|
|
||||||
The rest of the source code, apart from TurboJPEG/OSS and the Huffman codec
|
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.)
|
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
|
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
|
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.
|
||||||
|
|
||||||
|
|
||||||
*******************************************************************************
|
*******************************************************************************
|
||||||
|
|||||||
Reference in New Issue
Block a user