diff --git a/src/3rdparty/jasper/qt_attribution.json b/src/3rdparty/jasper/qt_attribution.json new file mode 100644 index 0000000000000000000000000000000000000000..2cc9d1509f2c062679c1a3d63d969e382b7273ed --- /dev/null +++ b/src/3rdparty/jasper/qt_attribution.json @@ -0,0 +1,16 @@ +{ + "Id": "jasper", + "Name": "JasPer", + "QDocModule": "qtimageformats", + "QtUsage": "Used in the QJp2 image plugin if no system jasper library is found.", + + "Description": "JasPer is a collection of software (i.e., a library and application programs) for the coding and manipulation of images.", + "Homepage": "http://www.ece.uvic.ca/~mdadams/jasper", + "Version": "1.900.1", + "License": "JasPer License", + "LicenseId": "JasPer-2.0", + "LicenseFile": "LICENSE", + "Copyright": "Copyright (c) 1999-2000 Image Power, Inc. and the University of British Columbia. +Copyright (c) 2001-2006 Michael David Adams. +" +} diff --git a/src/3rdparty/libmng/qt_LICENSE b/src/3rdparty/libmng/qt_LICENSE new file mode 100644 index 0000000000000000000000000000000000000000..501c887a9d38902bee469cd7ce3bc174d075f73b --- /dev/null +++ b/src/3rdparty/libmng/qt_LICENSE @@ -0,0 +1,53 @@ +Copyright (c) 2000-2007 Gerard Juyn (gerard@libmng.com) +[You may insert additional notices after this sentence if you modify + this source] + +For the purposes of this copyright and license, "Contributing Authors" +is defined as the following set of individuals: + + Gerard Juyn + Glenn Randers-Pehrson + +The MNG Library is supplied "AS IS". The Contributing Authors +disclaim all warranties, expressed or implied, including, without +limitation, the warranties of merchantability and of fitness for any +purpose. The Contributing Authors assume no liability for direct, +indirect, incidental, special, exemplary, or consequential damages, +which may result from the use of the MNG Library, even if advised of +the possibility of such damage. + +Permission is hereby granted to use, copy, modify, and distribute this +source code, or portions hereof, for any purpose, without fee, subject +to the following restrictions: + +1. The origin of this source code must not be misrepresented; + you must not claim that you wrote the original software. + +2. Altered versions must be plainly marked as such and must not be + misrepresented as being the original source. + +3. This Copyright notice may not be removed or altered from any source + or altered source distribution. + +The Contributing Authors specifically permit, without fee, and +encourage the use of this source code as a component to supporting +the MNG and JNG file format in commercial products. If you use this +source code in a product, acknowledgment would be highly appreciated. + +************************************************************************ + +Parts of this software have been adapted from the libpng package. +Although this library supports all features from the PNG specification +(as MNG descends from it) it does not require the libpng package. +It does require the zlib library and optionally the IJG jpeg library, +and/or the "little-cms" library by Marti Maria (depending on the +inclusion of support for JNG and Full-Color-Management respectively. + +This library's function is primarily to read and display MNG +animations. It is not meant as a full-featured image-editing +component! It does however offer creation and editing functionality +at the chunk level. +(future modifications may include some more support for creation + and or editing) + +************************************************************************ diff --git a/src/3rdparty/libmng/qt_attribution.json b/src/3rdparty/libmng/qt_attribution.json new file mode 100644 index 0000000000000000000000000000000000000000..c5f413715d122562722a8055ffcbae6dc62c65ec --- /dev/null +++ b/src/3rdparty/libmng/qt_attribution.json @@ -0,0 +1,14 @@ +{ + "Id": "libmng", + "Name": "MNG reference library", + "QDocModule": "qtimageformats", + "QtUsage": "Used in the qmng image plugin if no system libmng is found.", + + "Description": "", + "Homepage": "http://www.libmng.com/", + "Version": "1.0.10", + "License": "zlib License", + "LicenseId": "Zlib", + "LicenseFile": "qt_LICENSE", + "Copyright": "Copyright (c) 2000-2007 Gerard Juyn (gerard@libmng.com)" +} diff --git a/src/3rdparty/libtiff/port/strtoull.c b/src/3rdparty/libtiff/port/strtoull.c index fb7739cc5628721f95a96f15b76c9c6b6f6675a2..c37ee16b2d19ecff175243aaa45e873da96e0428 100644 --- a/src/3rdparty/libtiff/port/strtoull.c +++ b/src/3rdparty/libtiff/port/strtoull.c @@ -2,6 +2,11 @@ * Copyright (c) 1992, 1993 * The Regents of the University of California. All rights reserved. * + * Copyright (c) 2011 The FreeBSD Foundation + * All rights reserved. + * Portions of this software were developed by David Chisnall + * under sponsorship from the FreeBSD Foundation. + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -10,11 +15,7 @@ * 2. 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. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/src/3rdparty/libtiff/qt_attribution.json b/src/3rdparty/libtiff/qt_attribution.json new file mode 100644 index 0000000000000000000000000000000000000000..8a00a8ff98cbc56aa9c3b6497a24fcb91cec63db --- /dev/null +++ b/src/3rdparty/libtiff/qt_attribution.json @@ -0,0 +1,15 @@ +{ + "Id": "libtiff", + "Name": "TIFF Software Distribution (libtiff)", + "QDocModule": "qtimageformats", + "QtUsage": "Used in the qtiff image plugin if no system libtiff is found.", + + "Description": "", + "Homepage": "http://www.simplesystems.org/libtiff/", + "Version": "4.0.6", + "License": "libtiff License", + "LicenseId": "libtiff", + "LicenseFile": "COPYRIGHT", + "Copyright": "Copyright (c) 1988-1997 Sam Leffler +Copyright (c) 1991-1997 Silicon Graphics, Inc." +} diff --git a/src/3rdparty/libwebp/qt_attribution.json b/src/3rdparty/libwebp/qt_attribution.json new file mode 100644 index 0000000000000000000000000000000000000000..6084e7a38ad8020c7bed9e47989ef8320c70573e --- /dev/null +++ b/src/3rdparty/libwebp/qt_attribution.json @@ -0,0 +1,14 @@ +{ + "Id": "libwebp", + "Name": "WebP (libwebp)", + "QDocModule": "qtimageformats", + "QtUsage": "Used in the qwebp image plugin if no system libwebp is found.", + + "Description": "WebP is a new image format that provides lossless and lossy compression for images on the web.", + "Homepage": "https://developers.google.com/speed/webp/", + "Version": "0.5.0", + "License": "BSD 3-clause \"New\" or \"Revised\" License", + "LicenseId": "BSD-3-Clause", + "LicenseFile": "COPYING", + "Copyright": "Copyright (c) 2010, Google Inc. All rights reserved." +} diff --git a/src/imageformats/doc/src/qtimageformats.qdoc b/src/imageformats/doc/src/qtimageformats.qdoc index 59980deb3e58c844cb388edd964fef296ddbf415..c7f9687daac544f87a4a7b624cb694d4bf399690 100644 --- a/src/imageformats/doc/src/qtimageformats.qdoc +++ b/src/imageformats/doc/src/qtimageformats.qdoc @@ -70,6 +70,19 @@ plugins/imageformats), together with the default image format plugins. They may be deployed to the target system in the same way as other plugins, see the \l{Deploying Plugins} documentation. +\section2 Licenses and Attributions + +Qt Image Formats is available under commercial licenses from \l{The Qt Company}. +In addition, it is available under the +\l{GNU Lesser General Public License, version 3}, or +the \l{GNU General Public License, version 2}. +See \l{Qt Licensing} for further details. + +Furthermore Qt Image Formats potentially contains third party +modules under following permissive licenses: + +\generatelist{groupsbymodule attributions-qtimageformats} + \section2 Security considerations Since these file formats are more rarely used, the codecs may be less diff --git a/src/plugins/imageformats/macjp2/macjp2.pro b/src/plugins/imageformats/macjp2/macjp2.pro index d7ece1b439edfb4ba676d1dc9cbf4667d7d4cf33..66aafb4508da8149ca1e9db3b9566e15bd501b79 100644 --- a/src/plugins/imageformats/macjp2/macjp2.pro +++ b/src/plugins/imageformats/macjp2/macjp2.pro @@ -2,9 +2,9 @@ TARGET = qmacjp2 PLUGIN_TYPE = imageformats PLUGIN_CLASS_NAME = QMacJp2Plugin -LIBS += -framework CoreFoundation -framework ImageIO +LIBS += -framework CoreFoundation -framework CoreGraphics -framework ImageIO -QT += core-private gui-private platformsupport-private +QT += core-private gui-private SOURCES += \ qmacjp2handler.cpp \