Changes - SailfishOS Open Build Service

Changes of Revision 2

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

[-] [+]	Changed	qtimageformats.spec
@@ -4,7 +4,7 @@ Name: qtimageformats VCS: git@github.com:maui-packages/qtimageformats#60baaaadc25a078d06230e7aa31d13c6792bc744 Summary: Qt Imageformats -Version: 5.3.2 +Version: 5.4.1 Release: 1 Group: Qt/Qt License: LGPLv2.1 with exception or GPLv3
[-] [+]	Deleted	qtimageformats-5.3.2.tar.xz/LICENSE.GPL ^
@@ -1,674 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice;
[-] [+]	Deleted	qtimageformats-5.3.2.tar.xz/LICENSE.LGPL ^
@@ -1,514 +0,0 @@ - GNU LESSER GENERAL PUBLIC LICENSE - - The Qt Toolkit is Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). - Contact: http://www.qt-project.org/legal - - You may use, distribute and copy the Qt GUI Toolkit under the terms of - GNU Lesser General Public License version 2.1, which is displayed below. - -------------------------------------------------------------------------- - - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) -
[-] [+]	Added	qtimageformats-5.4.1.tar.xz/.gitattributes ^
@@ -0,0 +1,3 @@ +.tag export-subst +.gitignore export-ignore +.gitattributes export-ignore
[-] [+]	Added	qtimageformats-5.4.1.tar.xz/.gitignore ^
@@ -0,0 +1,19 @@ +Makefile* +.pdb +.exe +.dll +.ilk +.obj +.lib +.res +.exp +.manifest +_resource.rc +moc_.cpp +.moc +.qmake.cache +config.log +tmp + +# Generated static plugin import sources +*_plugin_import.cpp
[-] [+]	Changed	qtimageformats-5.4.1.tar.xz/.qmake.conf ^
@@ -1,3 +1,3 @@ load(qt_build_config) -MODULE_VERSION = 5.3.2 +MODULE_VERSION = 5.4.1
[-] [+]	Changed	qtimageformats-5.4.1.tar.xz/.tag ^
@@ -1 +1 @@ -cccf0deca06a7ffa4534ce75e8d4cdb5f20a8b92 +$Format:%H$
[-] [+]	Added	qtimageformats-5.4.1.tar.xz/LICENSE.GPLv2 ^
@@ -0,0 +1,292 @@ + GNU GENERAL PUBLIC LICENSE + + The Qt Toolkit is Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). + Contact: http://www.qt-project.org/legal + + You may use, distribute and copy the Qt GUI Toolkit under the terms of + GNU General Public License version 2, which is displayed below. + +------------------------------------------------------------------------- + + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + +Everyone is permitted to copy and distribute verbatim copies of this +license document, but changing it is not allowed. + +Preamble + + The licenses for most software are designed to take away your freedom +to share and change it. By contrast, the GNU General Public License is +intended to guarantee your freedom to share and change free software +--to make sure the software is free for all its users. This General +Public License applies to most of the Free Software Foundation's +software and to any other program whose authors commit to using it. +(Some other Free Software Foundation software is covered by the GNU +Lesser General Public License instead.) You can apply it to your +programs, too. + +When we speak of free software, we are referring to freedom, not price. +Our General Public Licenses are designed to make sure that you have the +freedom to distribute copies of free software (and charge for this +service if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs; and that you know you can do these things. + +To protect your rights, we need to make restrictions that forbid anyone +to deny you these rights or to ask you to surrender the rights. These +restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + +For example, if you distribute copies of such a program, whether gratis + or for a fee, you must give the recipients all the rights that you +have. You must make sure that they, too, receive or can get the source +code. And you must show them these terms so they know their rights. + +We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + +Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + +Finally, any free program is threatened constantly by software patents. +We wish to avoid the danger that redistributors of a free program will +individually obtain patent licenses, in effect making the program +proprietary. To prevent this, we have made it clear that any patent +must be licensed for everyone's free use or not licensed at all. + +The precise terms and conditions for copying, distribution and +modification follow. + +TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + +0. This License applies to any program or other work which contains a +notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of running +the Program is not restricted, and the output from the Program is +covered only if its contents constitute a work based on the Program +(independent of having been made by running the Program). Whether that +is true depends on what the Program does. + +1. You may copy and distribute verbatim copies of the Program's source +code as you receive it, in any medium, provided that you conspicuously +and appropriately publish on each copy an appropriate copyright notice +and disclaimer of warranty; keep intact all the notices that refer to +this License and to the absence of any warranty; and give any other +recipients of the Program a copy of this License along with the +Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + +2. You may modify your copy or copies of the Program or any portion of +it, thus forming a work based on the Program, and copy and distribute +such modifications or work under the terms of Section 1 above, provided +that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but does + not normally print such an announcement, your work based on the + Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of a +storage or distribution medium does not bring the other work under the +scope of this License. + +3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software + interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your cost + of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to control +compilation and installation of the executable. However, as a special +exception, the source code distributed need not include anything that +is normally distributed (in either source or binary form) with the +major components (compiler, kernel, and so on) of the operating system +on which the executable runs, unless that component itself accompanies +the executable. + +If distribution of executable or object code is made by offering access +to copy from a designated place, then offering equivalent access to +copy the source code from the same place counts as distribution of the +source code, even though third parties are not compelled to copy the +source along with the object code. + +4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt otherwise +to copy, modify, sublicense or distribute the Program is void, and will +automatically terminate your rights under this License. However, +parties who have received copies, or rights, from you under this License +will not have their licenses terminated so long as such parties remain +in full compliance. + +5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. +
[-] [+]	Added	qtimageformats-5.4.1.tar.xz/LICENSE.LGPLv21 ^
@@ -0,0 +1,514 @@ + GNU LESSER GENERAL PUBLIC LICENSE + + The Qt Toolkit is Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). + Contact: http://www.qt-project.org/legal + + You may use, distribute and copy the Qt GUI Toolkit under the terms of + GNU Lesser General Public License version 2.1, which is displayed below. + +------------------------------------------------------------------------- + + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) +
[-] [+]	Added	qtimageformats-5.4.1.tar.xz/LICENSE.LGPLv3 ^
@@ -0,0 +1,173 @@ + GNU LESSER GENERAL PUBLIC LICENSE + + The Qt Toolkit is Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). + Contact: http://www.qt-project.org/legal + + You may use, distribute and copy the Qt GUI Toolkit under the terms of + GNU Lesser General Public License version 3, which is displayed below. + +------------------------------------------------------------------------- + + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright © 2007 Free Software Foundation, Inc. <http://fsf.org/> +Everyone is permitted to copy and distribute verbatim copies of this +licensedocument, but changing it is not allowed. + +This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + +0. Additional Definitions. + + As used herein, “this License” refers to version 3 of the GNU Lesser +General Public License, and the “GNU GPL” refers to version 3 of the +GNU General Public License. + + “The Library” refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An “Application” is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A “Combined Work” is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the “Linked +Version”. + + The “Minimal Corresponding Source” for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The “Corresponding Application Code” for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + +1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + +2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort + to ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + +3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this + license document. + +4. Combined Works. + + You may convey a Combined Work under terms of your choice that, taken +together, effectively do not restrict modification of the portions of +the Library contained in the Combined Work and reverse engineering for +debugging such modifications, if you also do each of the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this + license document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of + this License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with + the Library. A suitable mechanism is one that (a) uses at run + time a copy of the Library already present on the user's + computer system, and (b) will operate properly with a modified + version of the Library that is interface-compatible with the + Linked Version. + + e) Provide Installation Information, but only if you would + otherwise be required to provide such information under section 6 + of the GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the Application + with a modified version of the Linked Version. (If you use option + 4d0, the Installation Information must accompany the Minimal + Corresponding Source and Corresponding Application Code. If you + use option 4d1, you must provide the Installation Information in + the manner specified by section 6 of the GNU GPL for conveying + Corresponding Source.) + +5. Combined Libraries. + + You may place library facilities that are a work based on the Library +side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities, conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of + it is a work based on the Library, and explaining where to find + the accompanying uncombined form of the same work. + +6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +as you received it specifies that a certain numbered version of the +GNU Lesser General Public License “or any later version” applies to +it, you have the option of following the terms and conditions either +of that published version or of any later version published by the +Free Software Foundation. If the Library as you received it does not +specify a version number of the GNU Lesser General Public License, +you may choose any version of the GNU Lesser General Public License +ever published by the Free Software Foundation. + +If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the Library. +
[-] [+]	Changed	qtimageformats-5.4.1.tar.xz/config.tests/jasper/jasper.cpp ^
@@ -6,36 +6,28 @@ This file is part of the config.tests in the Qt ImageFormats module. - $QT_BEGIN_LICENSE:LGPL$ + $QT_BEGIN_LICENSE:LGPL21$ Commercial License Usage Licensees holding valid commercial Qt licenses may use this file in accordance with the commercial license agreement provided with the Software or, alternatively, in accordance with the terms contained in - a written agreement between you and Digia. For licensing terms and - conditions see http://qt.digia.com/licensing. For further information + a written agreement between you and Digia. For licensing terms and + conditions see http://qt.digia.com/licensing. For further information use the contact form at http://qt.digia.com/contact-us. GNU Lesser General Public License Usage Alternatively, this file may be used under the terms of the GNU Lesser - General Public License version 2.1 as published by the Free Software - Foundation and appearing in the file LICENSE.LGPL included in the - packaging of this file. Please review the following information to - ensure the GNU Lesser General Public License version 2.1 requirements - will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. + General Public License version 2.1 or version 3 as published by the Free + Software Foundation and appearing in the file LICENSE.LGPLv21 and + LICENSE.LGPLv3 included in the packaging of this file. Please review the + following information to ensure the GNU Lesser General Public License + requirements will be met: https://www.gnu.org/licenses/lgpl.html and + http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. In addition, as a special exception, Digia gives you certain additional - rights. These rights are described in the Digia Qt LGPL Exception + rights. These rights are described in the Digia Qt LGPL Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this package. - GNU General Public License Usage - Alternatively, this file may be used under the terms of the GNU - General Public License version 3.0 as published by the Free Software - Foundation and appearing in the file LICENSE.GPL included in the - packaging of this file. Please review the following information to - ensure the GNU General Public License version 3.0 requirements will be - met: http://www.gnu.org/copyleft/gpl.html. - - $QT_END_LICENSE$ **************************************************************************/
[-] [+]	Changed	qtimageformats-5.4.1.tar.xz/config.tests/libmng/libmng.cpp ^
@@ -1,44 +1,37 @@ /************************************************************************** - Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). + Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). Contact: http://www.qt-project.org/legal This file is part of the config.tests in the Qt ImageFormats module. - $QT_BEGIN_LICENSE:LGPL$ + $QT_BEGIN_LICENSE:LGPL21$ Commercial License Usage Licensees holding valid commercial Qt licenses may use this file in accordance with the commercial license agreement provided with the Software or, alternatively, in accordance with the terms contained in - a written agreement between you and Digia. For licensing terms and - conditions see http://qt.digia.com/licensing. For further information + a written agreement between you and Digia. For licensing terms and + conditions see http://qt.digia.com/licensing. For further information use the contact form at http://qt.digia.com/contact-us. GNU Lesser General Public License Usage Alternatively, this file may be used under the terms of the GNU Lesser - General Public License version 2.1 as published by the Free Software - Foundation and appearing in the file LICENSE.LGPL included in the - packaging of this file. Please review the following information to - ensure the GNU Lesser General Public License version 2.1 requirements - will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. + General Public License version 2.1 or version 3 as published by the Free + Software Foundation and appearing in the file LICENSE.LGPLv21 and + LICENSE.LGPLv3 included in the packaging of this file. Please review the + following information to ensure the GNU Lesser General Public License + requirements will be met: https://www.gnu.org/licenses/lgpl.html and + http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. In addition, as a special exception, Digia gives you certain additional - rights. These rights are described in the Digia Qt LGPL Exception + rights. These rights are described in the Digia Qt LGPL Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this package. - GNU General Public License Usage - Alternatively, this file may be used under the terms of the GNU - General Public License version 3.0 as published by the Free Software - Foundation and appearing in the file LICENSE.GPL included in the - packaging of this file. Please review the following information to - ensure the GNU General Public License version 3.0 requirements will be - met: http://www.gnu.org/copyleft/gpl.html. - - $QT_END_LICENSE$ **************************************************************************/ +#include <stdio.h> #include <libmng.h> int main(int, char )
[-] [+]	Changed	qtimageformats-5.4.1.tar.xz/config.tests/libtiff/libtiff.cpp ^
@@ -1,40 +1,32 @@ /************************************************************************** - Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). + Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). Contact: http://www.qt-project.org/legal This file is part of the config.tests of the Qt Toolkit. - $QT_BEGIN_LICENSE:LGPL$ + $QT_BEGIN_LICENSE:LGPL21$ Commercial License Usage Licensees holding valid commercial Qt licenses may use this file in accordance with the commercial license agreement provided with the Software or, alternatively, in accordance with the terms contained in - a written agreement between you and Digia. For licensing terms and - conditions see http://qt.digia.com/licensing. For further information + a written agreement between you and Digia. For licensing terms and + conditions see http://qt.digia.com/licensing. For further information use the contact form at http://qt.digia.com/contact-us. GNU Lesser General Public License Usage Alternatively, this file may be used under the terms of the GNU Lesser - General Public License version 2.1 as published by the Free Software - Foundation and appearing in the file LICENSE.LGPL included in the - packaging of this file. Please review the following information to - ensure the GNU Lesser General Public License version 2.1 requirements - will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. + General Public License version 2.1 or version 3 as published by the Free + Software Foundation and appearing in the file LICENSE.LGPLv21 and + LICENSE.LGPLv3 included in the packaging of this file. Please review the + following information to ensure the GNU Lesser General Public License + requirements will be met: https://www.gnu.org/licenses/lgpl.html and + http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. In addition, as a special exception, Digia gives you certain additional - rights. These rights are described in the Digia Qt LGPL Exception + rights. These rights are described in the Digia Qt LGPL Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this package. - GNU General Public License Usage - Alternatively, this file may be used under the terms of the GNU - General Public License version 3.0 as published by the Free Software - Foundation and appearing in the file LICENSE.GPL included in the - packaging of this file. Please review the following information to - ensure the GNU General Public License version 3.0 requirements will be - met: http://www.gnu.org/copyleft/gpl.html. - - $QT_END_LICENSE$ ****************************************************************************/
[-] [+]	Changed	qtimageformats-5.4.1.tar.xz/config.tests/libwebp/libwebp.cpp ^
@@ -1,51 +1,52 @@ /************************************************************************** - Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). + Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). Contact: http://www.qt-project.org/legal This file is part of the config.tests in the Qt ImageFormats module. - $QT_BEGIN_LICENSE:LGPL$ + $QT_BEGIN_LICENSE:LGPL21$ Commercial License Usage Licensees holding valid commercial Qt licenses may use this file in accordance with the commercial license agreement provided with the Software or, alternatively, in accordance with the terms contained in - a written agreement between you and Digia. For licensing terms and - conditions see http://qt.digia.com/licensing. For further information + a written agreement between you and Digia. For licensing terms and + conditions see http://qt.digia.com/licensing. For further information use the contact form at http://qt.digia.com/contact-us. GNU Lesser General Public License Usage Alternatively, this file may be used under the terms of the GNU Lesser - General Public License version 2.1 as published by the Free Software - Foundation and appearing in the file LICENSE.LGPL included in the - packaging of this file. Please review the following information to - ensure the GNU Lesser General Public License version 2.1 requirements - will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. + General Public License version 2.1 or version 3 as published by the Free + Software Foundation and appearing in the file LICENSE.LGPLv21 and + LICENSE.LGPLv3 included in the packaging of this file. Please review the + following information to ensure the GNU Lesser General Public License + requirements will be met: https://www.gnu.org/licenses/lgpl.html and + http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. In addition, as a special exception, Digia gives you certain additional - rights. These rights are described in the Digia Qt LGPL Exception + rights. These rights are described in the Digia Qt LGPL Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this package. - GNU General Public License Usage - Alternatively, this file may be used under the terms of the GNU - General Public License version 3.0 as published by the Free Software - Foundation and appearing in the file LICENSE.GPL included in the - packaging of this file. Please review the following information to - ensure the GNU General Public License version 3.0 requirements will be - met: http://www.gnu.org/copyleft/gpl.html. - - $QT_END_LICENSE$ **************************************************************************/ #include <webp/decode.h> +#include <webp/encode.h> + +#if WEBP_ABI_IS_INCOMPATIBLE(WEBP_DECODER_ABI_VERSION, 0x0203) \|\| WEBP_ABI_IS_INCOMPATIBLE(WEBP_ENCODER_ABI_VERSION, 0x0202) +#error "Incompatible libwebp version" +#endif int main(int, char ) { WebPDecoderConfig config; WebPDecBuffer output_buffer = &config.output; WebPBitstreamFeatures bitstream = &config.input; + WebPPicture picture; + picture.use_argb = 0; + WebPConfig config2; + config2.lossless = 0; return 0; }
[-] [+]	Changed	qtimageformats-5.4.1.tar.xz/src/3rdparty/jasper/src/libjasper/base/jas_getopt.c ^
@@ -74,6 +74,7 @@ #include <stdio.h> #include <string.h> +#include "jasper/jas_debug.h" #include "jasper/jas_getopt.h" #include "jasper/jas_math.h"
[-] [+]	Changed	qtimageformats-5.4.1.tar.xz/src/3rdparty/jasper/src/libjasper/bmp/bmp_dec.c ^
@@ -73,6 +73,7 @@ #include <assert.h> +#include "jasper/jas_debug.h" #include "jasper/jas_types.h" #include "jasper/jas_stream.h" #include "jasper/jas_image.h"
[-] [+]	Changed	qtimageformats-5.4.1.tar.xz/src/3rdparty/jasper/src/libjasper/jpc/jpc_t1dec.c ^
@@ -75,6 +75,7 @@ #include <stdlib.h> #include <assert.h> +#include "jasper/jas_debug.h" #include "jasper/jas_fix.h" #include "jasper/jas_stream.h" #include "jasper/jas_math.h"
[-] [+]	Changed	qtimageformats-5.4.1.tar.xz/src/3rdparty/jasper/src/libjasper/jpc/jpc_tsfb.c ^
@@ -119,14 +119,6 @@ free(tsfb); } -int jpc_tsfb_analyze(jpc_tsfb_t tsfb, jas_seq2d_t a) -{ - return (tsfb->numlvls > 0) ? jpc_tsfb_analyze2(tsfb, jas_seq2d_getref(a, - jas_seq2d_xstart(a), jas_seq2d_ystart(a)), jas_seq2d_xstart(a), - jas_seq2d_ystart(a), jas_seq2d_width(a), - jas_seq2d_height(a), jas_seq2d_rowstep(a), tsfb->numlvls - 1) : 0; -} - int jpc_tsfb_analyze2(jpc_tsfb_t tsfb, int a, int xstart, int ystart, int width, int height, int stride, int numlvls) { @@ -146,11 +138,11 @@ return 0; } -int jpc_tsfb_synthesize(jpc_tsfb_t tsfb, jas_seq2d_t a) +int jpc_tsfb_analyze(jpc_tsfb_t tsfb, jas_seq2d_t a) { - return (tsfb->numlvls > 0) ? jpc_tsfb_synthesize2(tsfb, - jas_seq2d_getref(a, jas_seq2d_xstart(a), jas_seq2d_ystart(a)), - jas_seq2d_xstart(a), jas_seq2d_ystart(a), jas_seq2d_width(a), + return (tsfb->numlvls > 0) ? jpc_tsfb_analyze2(tsfb, jas_seq2d_getref(a, + jas_seq2d_xstart(a), jas_seq2d_ystart(a)), jas_seq2d_xstart(a), + jas_seq2d_ystart(a), jas_seq2d_width(a), jas_seq2d_height(a), jas_seq2d_rowstep(a), tsfb->numlvls - 1) : 0; } @@ -174,6 +166,14 @@ return 0; } +int jpc_tsfb_synthesize(jpc_tsfb_t tsfb, jas_seq2d_t a) +{ + return (tsfb->numlvls > 0) ? jpc_tsfb_synthesize2(tsfb, + jas_seq2d_getref(a, jas_seq2d_xstart(a), jas_seq2d_ystart(a)), + jas_seq2d_xstart(a), jas_seq2d_ystart(a), jas_seq2d_width(a), + jas_seq2d_height(a), jas_seq2d_rowstep(a), tsfb->numlvls - 1) : 0; +} + int jpc_tsfb_getbands(jpc_tsfb_t tsfb, uint_fast32_t xstart, uint_fast32_t ystart, uint_fast32_t xend, uint_fast32_t yend, jpc_tsfb_band_t bands)
[-] [+]	Changed	qtimageformats-5.4.1.tar.xz/src/3rdparty/jasper/src/libjasper/mif/mif_cod.c ^
@@ -65,6 +65,7 @@ #include <assert.h> +#include "jasper/jas_debug.h" #include "jasper/jas_tvp.h" #include "jasper/jas_stream.h" #include "jasper/jas_image.h"
[-] [+]	Changed	qtimageformats-5.4.1.tar.xz/src/3rdparty/jasper/src/libjasper/pnm/pnm_dec.c ^
@@ -76,6 +76,7 @@ #include <stdlib.h> #include <assert.h> +#include "jasper/jas_debug.h" #include "jasper/jas_types.h" #include "jasper/jas_stream.h" #include "jasper/jas_image.h"
[-] [+]	Changed	qtimageformats-5.4.1.tar.xz/src/imageformats/doc/qtimageformats.qdocconf ^
@@ -3,7 +3,6 @@ # Name of the project. project = QtImageFormats description = Qt Image Formats Documentation -url = http://qt-project.org/doc/qt-$QT_VER version = $QT_VERSION # Directories in which to search for files to document.
[-] [+]	Changed	qtimageformats-5.4.1.tar.xz/src/plugins/imageformats/dds/ddsheader.cpp ^
@@ -1,41 +1,33 @@ /************************************************************************** - Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). + Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). Copyright (C) 2013 Ivan Komissarov. Contact: http://www.qt-project.org/legal This file is part of the DDS plugin in the Qt ImageFormats module. - $QT_BEGIN_LICENSE:LGPL$ + $QT_BEGIN_LICENSE:LGPL21$ Commercial License Usage Licensees holding valid commercial Qt licenses may use this file in accordance with the commercial license agreement provided with the Software or, alternatively, in accordance with the terms contained in - a written agreement between you and Digia. For licensing terms and - conditions see http://qt.digia.com/licensing. For further information + a written agreement between you and Digia. For licensing terms and + conditions see http://qt.digia.com/licensing. For further information use the contact form at http://qt.digia.com/contact-us. GNU Lesser General Public License Usage Alternatively, this file may be used under the terms of the GNU Lesser - General Public License version 2.1 as published by the Free Software - Foundation and appearing in the file LICENSE.LGPL included in the - packaging of this file. Please review the following information to - ensure the GNU Lesser General Public License version 2.1 requirements - will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. + General Public License version 2.1 or version 3 as published by the Free + Software Foundation and appearing in the file LICENSE.LGPLv21 and + LICENSE.LGPLv3 included in the packaging of this file. Please review the + following information to ensure the GNU Lesser General Public License + requirements will be met: https://www.gnu.org/licenses/lgpl.html and + http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. In addition, as a special exception, Digia gives you certain additional - rights. These rights are described in the Digia Qt LGPL Exception + rights. These rights are described in the Digia Qt LGPL Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this package. - GNU General Public License Usage - Alternatively, this file may be used under the terms of the GNU - General Public License version 3.0 as published by the Free Software - Foundation and appearing in the file LICENSE.GPL included in the - packaging of this file. Please review the following information to - ensure the GNU General Public License version 3.0 requirements will be - met: http://www.gnu.org/copyleft/gpl.html. - - $QT_END_LICENSE$ **************************************************************************/
[-] [+]	Changed	qtimageformats-5.4.1.tar.xz/src/plugins/imageformats/dds/ddsheader.h ^
@@ -1,41 +1,33 @@ /************************************************************************** - Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). + Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). Copyright (C) 2013 Ivan Komissarov. Contact: http://www.qt-project.org/legal This file is part of the DDS plugin in the Qt ImageFormats module. - $QT_BEGIN_LICENSE:LGPL$ + $QT_BEGIN_LICENSE:LGPL21$ Commercial License Usage Licensees holding valid commercial Qt licenses may use this file in accordance with the commercial license agreement provided with the Software or, alternatively, in accordance with the terms contained in - a written agreement between you and Digia. For licensing terms and - conditions see http://qt.digia.com/licensing. For further information + a written agreement between you and Digia. For licensing terms and + conditions see http://qt.digia.com/licensing. For further information use the contact form at http://qt.digia.com/contact-us. GNU Lesser General Public License Usage Alternatively, this file may be used under the terms of the GNU Lesser - General Public License version 2.1 as published by the Free Software - Foundation and appearing in the file LICENSE.LGPL included in the - packaging of this file. Please review the following information to - ensure the GNU Lesser General Public License version 2.1 requirements - will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. + General Public License version 2.1 or version 3 as published by the Free + Software Foundation and appearing in the file LICENSE.LGPLv21 and + LICENSE.LGPLv3 included in the packaging of this file. Please review the + following information to ensure the GNU Lesser General Public License + requirements will be met: https://www.gnu.org/licenses/lgpl.html and + http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. In addition, as a special exception, Digia gives you certain additional - rights. These rights are described in the Digia Qt LGPL Exception + rights. These rights are described in the Digia Qt LGPL Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this package. - GNU General Public License Usage - Alternatively, this file may be used under the terms of the GNU - General Public License version 3.0 as published by the Free Software - Foundation and appearing in the file LICENSE.GPL included in the - packaging of this file. Please review the following information to - ensure the GNU General Public License version 3.0 requirements will be - met: http://www.gnu.org/copyleft/gpl.html. - - $QT_END_LICENSE$ **************************************************************************/
[-] [+]	Changed	qtimageformats-5.4.1.tar.xz/src/plugins/imageformats/dds/main.cpp ^
@@ -1,41 +1,33 @@ /************************************************************************** - Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). + Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). Copyright (C) 2013 Ivan Komissarov. Contact: http://www.qt-project.org/legal This file is part of the DDS plugin in the Qt ImageFormats module. - $QT_BEGIN_LICENSE:LGPL$ + $QT_BEGIN_LICENSE:LGPL21$ Commercial License Usage Licensees holding valid commercial Qt licenses may use this file in accordance with the commercial license agreement provided with the Software or, alternatively, in accordance with the terms contained in - a written agreement between you and Digia. For licensing terms and - conditions see http://qt.digia.com/licensing. For further information + a written agreement between you and Digia. For licensing terms and + conditions see http://qt.digia.com/licensing. For further information use the contact form at http://qt.digia.com/contact-us. GNU Lesser General Public License Usage Alternatively, this file may be used under the terms of the GNU Lesser - General Public License version 2.1 as published by the Free Software - Foundation and appearing in the file LICENSE.LGPL included in the - packaging of this file. Please review the following information to - ensure the GNU Lesser General Public License version 2.1 requirements - will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. + General Public License version 2.1 or version 3 as published by the Free + Software Foundation and appearing in the file LICENSE.LGPLv21 and + LICENSE.LGPLv3 included in the packaging of this file. Please review the + following information to ensure the GNU Lesser General Public License + requirements will be met: https://www.gnu.org/licenses/lgpl.html and + http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. In addition, as a special exception, Digia gives you certain additional - rights. These rights are described in the Digia Qt LGPL Exception + rights. These rights are described in the Digia Qt LGPL Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this package. - GNU General Public License Usage - Alternatively, this file may be used under the terms of the GNU - General Public License version 3.0 as published by the Free Software - Foundation and appearing in the file LICENSE.GPL included in the - packaging of this file. Please review the following information to - ensure the GNU General Public License version 3.0 requirements will be - met: http://www.gnu.org/copyleft/gpl.html. - - $QT_END_LICENSE$ **************************************************************************/
[-] [+]	Changed	qtimageformats-5.4.1.tar.xz/src/plugins/imageformats/dds/qddshandler.cpp ^
@@ -1,41 +1,33 @@ /************************************************************************** - Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). + Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). Copyright (C) 2013 Ivan Komissarov. Contact: http://www.qt-project.org/legal This file is part of the DDS plugin in the Qt ImageFormats module. - $QT_BEGIN_LICENSE:LGPL$ + $QT_BEGIN_LICENSE:LGPL21$ Commercial License Usage Licensees holding valid commercial Qt licenses may use this file in accordance with the commercial license agreement provided with the Software or, alternatively, in accordance with the terms contained in - a written agreement between you and Digia. For licensing terms and - conditions see http://qt.digia.com/licensing. For further information + a written agreement between you and Digia. For licensing terms and + conditions see http://qt.digia.com/licensing. For further information use the contact form at http://qt.digia.com/contact-us. GNU Lesser General Public License Usage Alternatively, this file may be used under the terms of the GNU Lesser - General Public License version 2.1 as published by the Free Software - Foundation and appearing in the file LICENSE.LGPL included in the - packaging of this file. Please review the following information to - ensure the GNU Lesser General Public License version 2.1 requirements - will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. + General Public License version 2.1 or version 3 as published by the Free + Software Foundation and appearing in the file LICENSE.LGPLv21 and + LICENSE.LGPLv3 included in the packaging of this file. Please review the + following information to ensure the GNU Lesser General Public License + requirements will be met: https://www.gnu.org/licenses/lgpl.html and + http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. In addition, as a special exception, Digia gives you certain additional - rights. These rights are described in the Digia Qt LGPL Exception + rights. These rights are described in the Digia Qt LGPL Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this package. - GNU General Public License Usage - Alternatively, this file may be used under the terms of the GNU - General Public License version 3.0 as published by the Free Software - Foundation and appearing in the file LICENSE.GPL included in the - packaging of this file. Please review the following information to - ensure the GNU General Public License version 3.0 requirements will be - met: http://www.gnu.org/copyleft/gpl.html. - - $QT_END_LICENSE$ *************************************************************************/ @@ -166,6 +158,101 @@ }; static const size_t knownFourCCsSize = sizeof(knownFourCCs)/sizeof(Format); +struct FormatName +{ + Format format; + const char const name; +}; +static const FormatName formatNames[] = { + { FormatUnknown, "unknown" }, + + { FormatR8G8B8, "R8G8B8" }, + { FormatA8R8G8B8, "A8R8G8B8" }, + { FormatX8R8G8B8, "X8R8G8B8" }, + { FormatR5G6B5, "R5G6B5" }, + { FormatX1R5G5B5, "X1R5G5B5" }, + { FormatA1R5G5B5, "A1R5G5B5" }, + { FormatA4R4G4B4, "A4R4G4B4" }, + { FormatR3G3B2, "R3G3B2" }, + { FormatA8, "A8" }, + { FormatA8R3G3B2, "A8R3G3B2" }, + { FormatX4R4G4B4, "X4R4G4B4" }, + { FormatA2B10G10R10, "A2B10G10R10" }, + { FormatA8B8G8R8, "A8B8G8R8" }, + { FormatX8B8G8R8, "X8B8G8R8" }, + { FormatG16R16, "G16R16" }, + { FormatA2R10G10B10, "A2R10G10B10" }, + { FormatA16B16G16R16, "A16B16G16R16" }, + + { FormatA8P8, "A8P8" }, + { FormatP8, "P8" }, + + { FormatL8, "L8" }, + { FormatA8L8, "A8L8" }, + { FormatA4L4, "A4L4" }, + + { FormatV8U8, "V8U8" }, + { FormatL6V5U5, "L6V5U5" }, + { FormatX8L8V8U8, "X8L8V8U8" }, + { FormatQ8W8V8U8, "Q8W8V8U8" }, + { FormatV16U16, "V16U16" }, + { FormatA2W10V10U10, "A2W10V10U10" }, + + { FormatUYVY, "UYVY" }, + { FormatR8G8B8G8, "R8G8_B8G8" }, + { FormatYUY2, "YUY2" }, + { FormatG8R8G8B8, "G8R8_G8B8" }, + { FormatDXT1, "DXT1" }, + { FormatDXT2, "DXT2" }, + { FormatDXT3, "DXT3" }, + { FormatDXT4, "DXT4" }, + { FormatDXT5, "DXT5" }, + { FormatRXGB, "RXGB" }, + { FormatATI2, "ATI2" }, + + { FormatD16Lockable, "D16Lockable" }, + { FormatD32, "D32" }, + { FormatD15S1, "D15S1" }, + { FormatD24S8, "D24S8" }, + { FormatD24X8, "D24X8" }, + { FormatD24X4S4, "D24X4S4" }, + { FormatD16, "D16" }, + + { FormatD32FLockable, "D32FLockable" }, + { FormatD24FS8, "D24FS8" }, + + { FormatD32Lockable, "D32Lockable" }, + { FormatS8Lockable, "S8Lockable" }, + + { FormatL16, "L16" }, + + { FormatVertexData, "VertexData" }, + { FormatIndex32, "Index32" }, + { FormatIndex32, "Index32" }, + + { FormatQ16W16V16U16, "Q16W16V16U16" }, + + { FormatMulti2ARGB8, "Multi2ARGB8" }, + + { FormatR16F, "R16F" }, + { FormatG16R16F, "G16R16F" }, + { FormatA16B16G16R16F, "A16B16G16R16F" }, + + { FormatR32F, "R32F" }, + { FormatG32R32F, "G32R32F" }, + { FormatA32B32G32R32F, "A32B32G32R32F" }, + + { FormatCxV8U8, "CxV8U8" }, + + { FormatA1, "A1" }, + { FormatA2B10G10R10_XR_BIAS, "A2B10G10R10_XR_BIAS" }, + { FormatBinaryBuffer, "BinaryBuffer" }, + + { FormatP4, "P4" }, + { FormatA4P4, "A4P4" } +}; +static const size_t formatNamesSize = sizeof(formatNames)/sizeof(FormatName); + static inline int maskToShift(quint32 mask) { if (mask == 0) @@ -1256,7 +1343,29 @@ return image; } +static QByteArray formatName(int format) +{ + for (size_t i = 0; i < formatNamesSize; ++i) { + if (formatNames[i].format == format) + return formatNames[i].name; + } + + return formatNames[0].name; +} + +static int formatByName(const QByteArray &name) +{ + const QByteArray loweredName = name.toLower(); + for (size_t i = 0; i < formatNamesSize; ++i) { + if (QByteArray(formatNames[i].name).toLower() == loweredName) + return formatNames[i].format; + } + + return FormatUnknown; +} + QDDSHandler::QDDSHandler() : + m_format(FormatA8R8G8B8), m_currentImage(0), m_scanState(ScanNotScanned) { @@ -1303,6 +1412,11 @@ bool QDDSHandler::write(const QImage &outImage) { + if (m_format != FormatA8R8G8B8) { + qWarning() << "Format" << formatName(m_format) << "is not supported"; + return false; + } + const QImage image = outImage.convertToFormat(QImage::Format_ARGB32); QDataStream s(device()); @@ -1362,6 +1476,10 @@ switch (option) { case QImageIOHandler::Size:
[-] [+]	Changed	qtimageformats-5.4.1.tar.xz/src/plugins/imageformats/dds/qddshandler.h ^
@@ -1,41 +1,33 @@ /************************************************************************** - Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). + Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). Copyright (C) 2013 Ivan Komissarov. Contact: http://www.qt-project.org/legal This file is part of the DDS plugin in the Qt ImageFormats module. - $QT_BEGIN_LICENSE:LGPL$ + $QT_BEGIN_LICENSE:LGPL21$ Commercial License Usage Licensees holding valid commercial Qt licenses may use this file in accordance with the commercial license agreement provided with the Software or, alternatively, in accordance with the terms contained in - a written agreement between you and Digia. For licensing terms and - conditions see http://qt.digia.com/licensing. For further information + a written agreement between you and Digia. For licensing terms and + conditions see http://qt.digia.com/licensing. For further information use the contact form at http://qt.digia.com/contact-us. GNU Lesser General Public License Usage Alternatively, this file may be used under the terms of the GNU Lesser - General Public License version 2.1 as published by the Free Software - Foundation and appearing in the file LICENSE.LGPL included in the - packaging of this file. Please review the following information to - ensure the GNU Lesser General Public License version 2.1 requirements - will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. + General Public License version 2.1 or version 3 as published by the Free + Software Foundation and appearing in the file LICENSE.LGPLv21 and + LICENSE.LGPLv3 included in the packaging of this file. Please review the + following information to ensure the GNU Lesser General Public License + requirements will be met: https://www.gnu.org/licenses/lgpl.html and + http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. In addition, as a special exception, Digia gives you certain additional - rights. These rights are described in the Digia Qt LGPL Exception + rights. These rights are described in the Digia Qt LGPL Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this package. - GNU General Public License Usage - Alternatively, this file may be used under the terms of the GNU - General Public License version 3.0 as published by the Free Software - Foundation and appearing in the file LICENSE.GPL included in the - packaging of this file. Please review the following information to - ensure the GNU General Public License version 3.0 requirements will be - met: http://www.gnu.org/copyleft/gpl.html. - - $QT_END_LICENSE$ **************************************************************************/ @@ -62,6 +54,7 @@ bool write(const QImage &image); QVariant option(QImageIOHandler::ImageOption option) const; + void setOption(ImageOption option, const QVariant &value); bool supportsOption(QImageIOHandler::ImageOption option) const; int imageCount() const;
[-] [+]	Changed	qtimageformats-5.4.1.tar.xz/src/plugins/imageformats/icns/main.cpp ^
@@ -1,41 +1,33 @@ /************************************************************************** - Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). + Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). Copyright (C) 2013 Alex Char. Contact: http://www.qt-project.org/legal This file is part of the plugins of the Qt Toolkit. - $QT_BEGIN_LICENSE:LGPL$ + $QT_BEGIN_LICENSE:LGPL21$ Commercial License Usage Licensees holding valid commercial Qt licenses may use this file in accordance with the commercial license agreement provided with the Software or, alternatively, in accordance with the terms contained in - a written agreement between you and Digia. For licensing terms and - conditions see http://qt.digia.com/licensing. For further information + a written agreement between you and Digia. For licensing terms and + conditions see http://qt.digia.com/licensing. For further information use the contact form at http://qt.digia.com/contact-us. GNU Lesser General Public License Usage Alternatively, this file may be used under the terms of the GNU Lesser - General Public License version 2.1 as published by the Free Software - Foundation and appearing in the file LICENSE.LGPL included in the - packaging of this file. Please review the following information to - ensure the GNU Lesser General Public License version 2.1 requirements - will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. + General Public License version 2.1 or version 3 as published by the Free + Software Foundation and appearing in the file LICENSE.LGPLv21 and + LICENSE.LGPLv3 included in the packaging of this file. Please review the + following information to ensure the GNU Lesser General Public License + requirements will be met: https://www.gnu.org/licenses/lgpl.html and + http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. In addition, as a special exception, Digia gives you certain additional - rights. These rights are described in the Digia Qt LGPL Exception + rights. These rights are described in the Digia Qt LGPL Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this package. - GNU General Public License Usage - Alternatively, this file may be used under the terms of the GNU - General Public License version 3.0 as published by the Free Software - Foundation and appearing in the file LICENSE.GPL included in the - packaging of this file. Please review the following information to - ensure the GNU General Public License version 3.0 requirements will be - met: http://www.gnu.org/copyleft/gpl.html. - - $QT_END_LICENSE$ **************************************************************************/
[-] [+]	Changed	qtimageformats-5.4.1.tar.xz/src/plugins/imageformats/icns/qicnshandler.cpp ^
@@ -1,41 +1,33 @@ /************************************************************************** - Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). + Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). Copyright (C) 2013 Alex Char. Contact: http://www.qt-project.org/legal This file is part of the plugins of the Qt Toolkit. - $QT_BEGIN_LICENSE:LGPL$ + $QT_BEGIN_LICENSE:LGPL21$ Commercial License Usage Licensees holding valid commercial Qt licenses may use this file in accordance with the commercial license agreement provided with the Software or, alternatively, in accordance with the terms contained in - a written agreement between you and Digia. For licensing terms and - conditions see http://qt.digia.com/licensing. For further information + a written agreement between you and Digia. For licensing terms and + conditions see http://qt.digia.com/licensing. For further information use the contact form at http://qt.digia.com/contact-us. GNU Lesser General Public License Usage Alternatively, this file may be used under the terms of the GNU Lesser - General Public License version 2.1 as published by the Free Software - Foundation and appearing in the file LICENSE.LGPL included in the - packaging of this file. Please review the following information to - ensure the GNU Lesser General Public License version 2.1 requirements - will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. + General Public License version 2.1 or version 3 as published by the Free + Software Foundation and appearing in the file LICENSE.LGPLv21 and + LICENSE.LGPLv3 included in the packaging of this file. Please review the + following information to ensure the GNU Lesser General Public License + requirements will be met: https://www.gnu.org/licenses/lgpl.html and + http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. In addition, as a special exception, Digia gives you certain additional - rights. These rights are described in the Digia Qt LGPL Exception + rights. These rights are described in the Digia Qt LGPL Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this package. - GNU General Public License Usage - Alternatively, this file may be used under the terms of the GNU - General Public License version 3.0 as published by the Free Software - Foundation and appearing in the file LICENSE.GPL included in the - packaging of this file. Please review the following information to - ensure the GNU General Public License version 3.0 requirements will be - met: http://www.gnu.org/copyleft/gpl.html. - - $QT_END_LICENSE$ *************************************************************************/ @@ -372,7 +364,8 @@ static inline bool isMaskSuitable(const ICNSEntry &mask, const ICNSEntry &icon, ICNSEntry::Depth target) { - return mask.depth == target && mask.height == icon.height && mask.width == icon.width; + return mask.variant == icon.variant && mask.depth == target + && mask.height == icon.height && mask.width == icon.width; } static inline QByteArray nameFromOSType(quint32 ostype) @@ -664,12 +657,15 @@ return false; } - if (device->isSequential()) { - qWarning("QICNSHandler::canRead() called on a sequential device"); - return false; + if (device->peek(4) == QByteArrayLiteral("icns")) { + if (device->isSequential()) { + qWarning("QICNSHandler::canRead() called on a sequential device"); + return false; + } + return true; } - return device->peek(4) == QByteArrayLiteral("icns"); + return false; } bool QICNSHandler::canRead() const @@ -813,6 +809,8 @@ if (option == SubType) { if (imageCount() > 0 && m_currentIconIndex <= imageCount()) { const ICNSEntry &icon = m_icons.at(m_currentIconIndex); + if (icon.variant != 0) + return nameFromOSType(icon.variant) + '-' + nameFromOSType(icon.ostype); return nameFromOSType(icon.ostype); } } @@ -852,11 +850,12 @@ return m_state == ScanSuccess; } -bool QICNSHandler::addEntry(const ICNSBlockHeader &header, qint64 imgDataOffset) +bool QICNSHandler::addEntry(const ICNSBlockHeader &header, qint64 imgDataOffset, quint32 variant) { // Note: This function returns false only when a device positioning error occurred ICNSEntry entry; entry.ostype = header.ostype; + entry.variant = variant; entry.dataOffset = imgDataOffset; entry.dataLength = header.length - ICNSBlockHeaderSize; // Check for known magic numbers: @@ -920,6 +919,37 @@ // We don't have a good use for these blocks... yet. stream.skipRawData(blockDataLength); break; + case ICNSBlockHeader::TypeTile: + case ICNSBlockHeader::TypeOver: + case ICNSBlockHeader::TypeOpen: + case ICNSBlockHeader::TypeDrop: + case ICNSBlockHeader::TypeOdrp: + // Icns container seems to have an embedded icon variant container + // Let's start a scan for entries + while (device()->pos() < nextBlockOffset) { + ICNSBlockHeader icon; + stream >> icon; + // Check for incorrect variant entry header and stop scan + if (!isBlockHeaderValid(icon, blockDataLength)) + break; + if (!addEntry(icon, device()->pos(), blockHeader.ostype)) + return false; + if (stream.skipRawData(icon.length - ICNSBlockHeaderSize) < 0) + return false; + } + if (device()->pos() != nextBlockOffset) { + // Scan of this container didn't end where we expected. + // Let's generate some output about this incident: + qWarning("Scan of the icon variant container (\"%s\") failed at pos %s.\n" \ + "Reason: Scan didn't reach the end of this container's block, " \ + "delta: %s bytes. This file may be corrupted.", + nameFromOSType(blockHeader.ostype).constData(), + QByteArray::number(device()->pos()).constData(), + QByteArray::number(nextBlockOffset - device()->pos()).constData()); + if (!device()->seek(nextBlockOffset)) + return false; + } + break; case ICNSBlockHeader::TypeToc: { // Quick scan, table of contents if (blockDataOffset != ICNSBlockHeaderSize 2) {
[-] [+]	Changed	qtimageformats-5.4.1.tar.xz/src/plugins/imageformats/icns/qicnshandler_p.h ^
@@ -1,41 +1,33 @@ /************************************************************************** - Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). + Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). Copyright (C) 2013 Alex Char. Contact: http://www.qt-project.org/legal This file is part of the plugins of the Qt Toolkit. - $QT_BEGIN_LICENSE:LGPL$ + $QT_BEGIN_LICENSE:LGPL21$ Commercial License Usage Licensees holding valid commercial Qt licenses may use this file in accordance with the commercial license agreement provided with the Software or, alternatively, in accordance with the terms contained in - a written agreement between you and Digia. For licensing terms and - conditions see http://qt.digia.com/licensing. For further information + a written agreement between you and Digia. For licensing terms and + conditions see http://qt.digia.com/licensing. For further information use the contact form at http://qt.digia.com/contact-us. GNU Lesser General Public License Usage Alternatively, this file may be used under the terms of the GNU Lesser - General Public License version 2.1 as published by the Free Software - Foundation and appearing in the file LICENSE.LGPL included in the - packaging of this file. Please review the following information to - ensure the GNU Lesser General Public License version 2.1 requirements - will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. + General Public License version 2.1 or version 3 as published by the Free + Software Foundation and appearing in the file LICENSE.LGPLv21 and + LICENSE.LGPLv3 included in the packaging of this file. Please review the + following information to ensure the GNU Lesser General Public License + requirements will be met: https://www.gnu.org/licenses/lgpl.html and + http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. In addition, as a special exception, Digia gives you certain additional - rights. These rights are described in the Digia Qt LGPL Exception + rights. These rights are described in the Digia Qt LGPL Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this package. - GNU General Public License Usage - Alternatively, this file may be used under the terms of the GNU - General Public License version 3.0 as published by the Free Software - Foundation and appearing in the file LICENSE.GPL included in the - packaging of this file. Please review the following information to - ensure the GNU General Public License version 3.0 requirements will be - met: http://www.gnu.org/copyleft/gpl.html. - - $QT_END_LICENSE$ **************************************************************************/ @@ -60,6 +52,11 @@ TypeIcnv = MAKEOSTYPE('i', 'c', 'n', 'V'), // Icon Composer version // Legacy: TypeClut = MAKEOSTYPE('c', 'l', 'u', 't'), // Color look-up table (pre-OS X resources) + TypeTile = MAKEOSTYPE('t', 'i', 'l', 'e'), // Container (icon variants) + TypeOver = MAKEOSTYPE('o', 'v', 'e', 'r'), // Container (icon variants) + TypeOpen = MAKEOSTYPE('o', 'p', 'e', 'n'), // Container (icon variants) + TypeDrop = MAKEOSTYPE('d', 'r', 'o', 'p'), // Container (icon variants) + TypeOdrp = MAKEOSTYPE('o', 'd', 'r', 'p'), // Container (icon variants) }; quint32 ostype; @@ -102,6 +99,7 @@ }; quint32 ostype; // Real OSType + quint32 variant; // Virtual OSType: a parent container, zero if parent is icns root Group group; // ASCII character number quint32 width; // For uncompressed icons only, zero for compressed ones for now quint32 height; // For uncompressed icons only, zero for compressed ones fow now @@ -112,7 +110,7 @@ qint64 dataOffset; // Offset from the initial position of the file/device ICNSEntry() : - ostype(0), group(GroupUnknown), width(0), height(0), depth(DepthUnknown), + ostype(0), variant(0), group(GroupUnknown), width(0), height(0), depth(DepthUnknown), flags(Unknown), dataFormat(FormatUnknown), dataLength(0), dataOffset(0) { } @@ -142,7 +140,7 @@ private: bool ensureScanned() const; bool scanDevice(); - bool addEntry(const ICNSBlockHeader &header, qint64 imgDataOffset); + bool addEntry(const ICNSBlockHeader &header, qint64 imgDataOffset, quint32 variant = 0); const ICNSEntry &getIconMask(const ICNSEntry &icon) const; private:
[-] [+]	Changed	qtimageformats-5.4.1.tar.xz/src/plugins/imageformats/imageformats.pro ^
@@ -16,4 +16,4 @@ tga } -winrt\|android: SUBDIRS -= webp +winrt\|android\|ios: SUBDIRS -= webp
[-] [+]	Changed	qtimageformats-5.4.1.tar.xz/src/plugins/imageformats/jp2/main.cpp ^
@@ -6,36 +6,28 @@ This file is part of the JP2 plugins in the Qt ImageFormats module. - $QT_BEGIN_LICENSE:LGPL$ + $QT_BEGIN_LICENSE:LGPL21$ Commercial License Usage Licensees holding valid commercial Qt licenses may use this file in accordance with the commercial license agreement provided with the Software or, alternatively, in accordance with the terms contained in - a written agreement between you and Digia. For licensing terms and - conditions see http://qt.digia.com/licensing. For further information + a written agreement between you and Digia. For licensing terms and + conditions see http://qt.digia.com/licensing. For further information use the contact form at http://qt.digia.com/contact-us. GNU Lesser General Public License Usage Alternatively, this file may be used under the terms of the GNU Lesser - General Public License version 2.1 as published by the Free Software - Foundation and appearing in the file LICENSE.LGPL included in the - packaging of this file. Please review the following information to - ensure the GNU Lesser General Public License version 2.1 requirements - will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. + General Public License version 2.1 or version 3 as published by the Free + Software Foundation and appearing in the file LICENSE.LGPLv21 and + LICENSE.LGPLv3 included in the packaging of this file. Please review the + following information to ensure the GNU Lesser General Public License + requirements will be met: https://www.gnu.org/licenses/lgpl.html and + http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. In addition, as a special exception, Digia gives you certain additional - rights. These rights are described in the Digia Qt LGPL Exception + rights. These rights are described in the Digia Qt LGPL Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this package. - GNU General Public License Usage - Alternatively, this file may be used under the terms of the GNU - General Public License version 3.0 as published by the Free Software - Foundation and appearing in the file LICENSE.GPL included in the - packaging of this file. Please review the following information to - ensure the GNU General Public License version 3.0 requirements will be - met: http://www.gnu.org/copyleft/gpl.html. - - $QT_END_LICENSE$ **************************************************************************/
[-] [+]	Changed	qtimageformats-5.4.1.tar.xz/src/plugins/imageformats/jp2/qjp2handler.cpp ^
@@ -6,36 +6,28 @@ This file is part of the JP2 plugins in the Qt ImageFormats module. - $QT_BEGIN_LICENSE:LGPL$ + $QT_BEGIN_LICENSE:LGPL21$ Commercial License Usage Licensees holding valid commercial Qt licenses may use this file in accordance with the commercial license agreement provided with the Software or, alternatively, in accordance with the terms contained in - a written agreement between you and Digia. For licensing terms and - conditions see http://qt.digia.com/licensing. For further information + a written agreement between you and Digia. For licensing terms and + conditions see http://qt.digia.com/licensing. For further information use the contact form at http://qt.digia.com/contact-us. GNU Lesser General Public License Usage Alternatively, this file may be used under the terms of the GNU Lesser - General Public License version 2.1 as published by the Free Software - Foundation and appearing in the file LICENSE.LGPL included in the - packaging of this file. Please review the following information to - ensure the GNU Lesser General Public License version 2.1 requirements - will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. + General Public License version 2.1 or version 3 as published by the Free + Software Foundation and appearing in the file LICENSE.LGPLv21 and + LICENSE.LGPLv3 included in the packaging of this file. Please review the + following information to ensure the GNU Lesser General Public License + requirements will be met: https://www.gnu.org/licenses/lgpl.html and + http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. In addition, as a special exception, Digia gives you certain additional - rights. These rights are described in the Digia Qt LGPL Exception + rights. These rights are described in the Digia Qt LGPL Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this package. - GNU General Public License Usage - Alternatively, this file may be used under the terms of the GNU - General Public License version 3.0 as published by the Free Software - Foundation and appearing in the file LICENSE.GPL included in the - packaging of this file. Please review the following information to - ensure the GNU General Public License version 3.0 requirements will be - met: http://www.gnu.org/copyleft/gpl.html. - - $QT_END_LICENSE$ **************************************************************************/ @@ -1212,6 +1204,8 @@ jas_image_cmpttlx(image, c), jas_image_cmpttly(image, c), jas_image_cmptbrx(image, c), jas_image_cmptbry(image, c)); } +#else + Q_UNUSED(image); #endif }
[-] [+]	Changed	qtimageformats-5.4.1.tar.xz/src/plugins/imageformats/jp2/qjp2handler_p.h ^
@@ -6,36 +6,28 @@ This file is part of the JP2 plugins in the Qt ImageFormats module. - $QT_BEGIN_LICENSE:LGPL$ + $QT_BEGIN_LICENSE:LGPL21$ Commercial License Usage Licensees holding valid commercial Qt licenses may use this file in accordance with the commercial license agreement provided with the Software or, alternatively, in accordance with the terms contained in - a written agreement between you and Digia. For licensing terms and - conditions see http://qt.digia.com/licensing. For further information + a written agreement between you and Digia. For licensing terms and + conditions see http://qt.digia.com/licensing. For further information use the contact form at http://qt.digia.com/contact-us. GNU Lesser General Public License Usage Alternatively, this file may be used under the terms of the GNU Lesser - General Public License version 2.1 as published by the Free Software - Foundation and appearing in the file LICENSE.LGPL included in the - packaging of this file. Please review the following information to - ensure the GNU Lesser General Public License version 2.1 requirements - will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. + General Public License version 2.1 or version 3 as published by the Free + Software Foundation and appearing in the file LICENSE.LGPLv21 and + LICENSE.LGPLv3 included in the packaging of this file. Please review the + following information to ensure the GNU Lesser General Public License + requirements will be met: https://www.gnu.org/licenses/lgpl.html and + http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. In addition, as a special exception, Digia gives you certain additional - rights. These rights are described in the Digia Qt LGPL Exception + rights. These rights are described in the Digia Qt LGPL Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this package. - GNU General Public License Usage - Alternatively, this file may be used under the terms of the GNU - General Public License version 3.0 as published by the Free Software - Foundation and appearing in the file LICENSE.GPL included in the - packaging of this file. Please review the following information to - ensure the GNU General Public License version 3.0 requirements will be - met: http://www.gnu.org/copyleft/gpl.html. - - $QT_END_LICENSE$ **************************************************************************/
[-] [+]	Changed	qtimageformats-5.4.1.tar.xz/src/plugins/imageformats/mng/main.cpp ^
@@ -1,40 +1,32 @@ /************************************************************************** - Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). + Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). Contact: http://www.qt-project.org/legal This file is part of the MNG plugins in the Qt ImageFormats module. - $QT_BEGIN_LICENSE:LGPL$ + $QT_BEGIN_LICENSE:LGPL21$ Commercial License Usage Licensees holding valid commercial Qt licenses may use this file in accordance with the commercial license agreement provided with the Software or, alternatively, in accordance with the terms contained in - a written agreement between you and Digia. For licensing terms and - conditions see http://qt.digia.com/licensing. For further information + a written agreement between you and Digia. For licensing terms and + conditions see http://qt.digia.com/licensing. For further information use the contact form at http://qt.digia.com/contact-us. GNU Lesser General Public License Usage Alternatively, this file may be used under the terms of the GNU Lesser - General Public License version 2.1 as published by the Free Software - Foundation and appearing in the file LICENSE.LGPL included in the - packaging of this file. Please review the following information to - ensure the GNU Lesser General Public License version 2.1 requirements - will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. + General Public License version 2.1 or version 3 as published by the Free + Software Foundation and appearing in the file LICENSE.LGPLv21 and + LICENSE.LGPLv3 included in the packaging of this file. Please review the + following information to ensure the GNU Lesser General Public License + requirements will be met: https://www.gnu.org/licenses/lgpl.html and + http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. In addition, as a special exception, Digia gives you certain additional - rights. These rights are described in the Digia Qt LGPL Exception + rights. These rights are described in the Digia Qt LGPL Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this package. - GNU General Public License Usage - Alternatively, this file may be used under the terms of the GNU - General Public License version 3.0 as published by the Free Software - Foundation and appearing in the file LICENSE.GPL included in the - packaging of this file. Please review the following information to - ensure the GNU General Public License version 3.0 requirements will be - met: http://www.gnu.org/copyleft/gpl.html. - - $QT_END_LICENSE$ ****************************************************************************/
[-] [+]	Changed	qtimageformats-5.4.1.tar.xz/src/plugins/imageformats/mng/qmnghandler.cpp ^
@@ -1,40 +1,32 @@ /************************************************************************** - Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). + Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). Contact: http://www.qt-project.org/legal This file is part of the MNG plugins in the Qt ImageFormats module. - $QT_BEGIN_LICENSE:LGPL$ + $QT_BEGIN_LICENSE:LGPL21$ Commercial License Usage Licensees holding valid commercial Qt licenses may use this file in accordance with the commercial license agreement provided with the Software or, alternatively, in accordance with the terms contained in - a written agreement between you and Digia. For licensing terms and - conditions see http://qt.digia.com/licensing. For further information + a written agreement between you and Digia. For licensing terms and + conditions see http://qt.digia.com/licensing. For further information use the contact form at http://qt.digia.com/contact-us. GNU Lesser General Public License Usage Alternatively, this file may be used under the terms of the GNU Lesser - General Public License version 2.1 as published by the Free Software - Foundation and appearing in the file LICENSE.LGPL included in the - packaging of this file. Please review the following information to - ensure the GNU Lesser General Public License version 2.1 requirements - will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. + General Public License version 2.1 or version 3 as published by the Free + Software Foundation and appearing in the file LICENSE.LGPLv21 and + LICENSE.LGPLv3 included in the packaging of this file. Please review the + following information to ensure the GNU Lesser General Public License + requirements will be met: https://www.gnu.org/licenses/lgpl.html and + http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. In addition, as a special exception, Digia gives you certain additional - rights. These rights are described in the Digia Qt LGPL Exception + rights. These rights are described in the Digia Qt LGPL Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this package. - GNU General Public License Usage - Alternatively, this file may be used under the terms of the GNU - General Public License version 3.0 as published by the Free Software - Foundation and appearing in the file LICENSE.GPL included in the - packaging of this file. Please review the following information to - ensure the GNU General Public License version 3.0 requirements will be - met: http://www.gnu.org/copyleft/gpl.html. - - $QT_END_LICENSE$ ****************************************************************************/ @@ -349,7 +341,8 @@ bool QMngHandlerPrivate::jumpToNextImage() { - return jumpToImage((currentImageNumber()+1) % imageCount()); + const int numImages = imageCount(); + return numImages > 1 && jumpToImage((currentImageNumber() + 1) % numImages); } int QMngHandlerPrivate::nextImageDelay() const
[-] [+]	Changed	qtimageformats-5.4.1.tar.xz/src/plugins/imageformats/mng/qmnghandler_p.h ^
@@ -1,40 +1,32 @@ /************************************************************************** - Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). + Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). Contact: http://www.qt-project.org/legal This file is part of the MNG plugins in the Qt ImageFormats module. - $QT_BEGIN_LICENSE:LGPL$ + $QT_BEGIN_LICENSE:LGPL21$ Commercial License Usage Licensees holding valid commercial Qt licenses may use this file in accordance with the commercial license agreement provided with the Software or, alternatively, in accordance with the terms contained in - a written agreement between you and Digia. For licensing terms and - conditions see http://qt.digia.com/licensing. For further information + a written agreement between you and Digia. For licensing terms and + conditions see http://qt.digia.com/licensing. For further information use the contact form at http://qt.digia.com/contact-us. GNU Lesser General Public License Usage Alternatively, this file may be used under the terms of the GNU Lesser - General Public License version 2.1 as published by the Free Software - Foundation and appearing in the file LICENSE.LGPL included in the - packaging of this file. Please review the following information to - ensure the GNU Lesser General Public License version 2.1 requirements - will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. + General Public License version 2.1 or version 3 as published by the Free + Software Foundation and appearing in the file LICENSE.LGPLv21 and + LICENSE.LGPLv3 included in the packaging of this file. Please review the + following information to ensure the GNU Lesser General Public License + requirements will be met: https://www.gnu.org/licenses/lgpl.html and + http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. In addition, as a special exception, Digia gives you certain additional - rights. These rights are described in the Digia Qt LGPL Exception + rights. These rights are described in the Digia Qt LGPL Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this package. - GNU General Public License Usage - Alternatively, this file may be used under the terms of the GNU - General Public License version 3.0 as published by the Free Software - Foundation and appearing in the file LICENSE.GPL included in the - packaging of this file. Please review the following information to - ensure the GNU General Public License version 3.0 requirements will be - met: http://www.gnu.org/copyleft/gpl.html. - - $QT_END_LICENSE$ ****************************************************************************/
[-] [+]	Changed	qtimageformats-5.4.1.tar.xz/src/plugins/imageformats/tga/main.cpp ^
@@ -1,40 +1,32 @@ /************************************************************************** - Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). + Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). Contact: http://www.qt-project.org/legal This file is part of the TGA plugin in the Qt ImageFormats module. - $QT_BEGIN_LICENSE:LGPL$ + $QT_BEGIN_LICENSE:LGPL21$ Commercial License Usage Licensees holding valid commercial Qt licenses may use this file in accordance with the commercial license agreement provided with the Software or, alternatively, in accordance with the terms contained in - a written agreement between you and Digia. For licensing terms and - conditions see http://qt.digia.com/licensing. For further information + a written agreement between you and Digia. For licensing terms and + conditions see http://qt.digia.com/licensing. For further information use the contact form at http://qt.digia.com/contact-us. GNU Lesser General Public License Usage Alternatively, this file may be used under the terms of the GNU Lesser - General Public License version 2.1 as published by the Free Software - Foundation and appearing in the file LICENSE.LGPL included in the - packaging of this file. Please review the following information to - ensure the GNU Lesser General Public License version 2.1 requirements - will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. + General Public License version 2.1 or version 3 as published by the Free + Software Foundation and appearing in the file LICENSE.LGPLv21 and + LICENSE.LGPLv3 included in the packaging of this file. Please review the + following information to ensure the GNU Lesser General Public License + requirements will be met: https://www.gnu.org/licenses/lgpl.html and + http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. In addition, as a special exception, Digia gives you certain additional - rights. These rights are described in the Digia Qt LGPL Exception + rights. These rights are described in the Digia Qt LGPL Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this package. - GNU General Public License Usage - Alternatively, this file may be used under the terms of the GNU - General Public License version 3.0 as published by the Free Software - Foundation and appearing in the file LICENSE.GPL included in the - packaging of this file. Please review the following information to - ensure the GNU General Public License version 3.0 requirements will be - met: http://www.gnu.org/copyleft/gpl.html. - - $QT_END_LICENSE$ ****************************************************************************/
[-] [+]	Changed	qtimageformats-5.4.1.tar.xz/src/plugins/imageformats/tga/qtgafile.cpp ^
@@ -1,40 +1,32 @@ /************************************************************************** - Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). + Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). Contact: http://www.qt-project.org/legal This file is part of the TGA plugin in the Qt ImageFormats module. - $QT_BEGIN_LICENSE:LGPL$ + $QT_BEGIN_LICENSE:LGPL21$ Commercial License Usage Licensees holding valid commercial Qt licenses may use this file in accordance with the commercial license agreement provided with the Software or, alternatively, in accordance with the terms contained in - a written agreement between you and Digia. For licensing terms and - conditions see http://qt.digia.com/licensing. For further information + a written agreement between you and Digia. For licensing terms and + conditions see http://qt.digia.com/licensing. For further information use the contact form at http://qt.digia.com/contact-us. GNU Lesser General Public License Usage Alternatively, this file may be used under the terms of the GNU Lesser - General Public License version 2.1 as published by the Free Software - Foundation and appearing in the file LICENSE.LGPL included in the - packaging of this file. Please review the following information to - ensure the GNU Lesser General Public License version 2.1 requirements - will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. + General Public License version 2.1 or version 3 as published by the Free + Software Foundation and appearing in the file LICENSE.LGPLv21 and + LICENSE.LGPLv3 included in the packaging of this file. Please review the + following information to ensure the GNU Lesser General Public License + requirements will be met: https://www.gnu.org/licenses/lgpl.html and + http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. In addition, as a special exception, Digia gives you certain additional - rights. These rights are described in the Digia Qt LGPL Exception + rights. These rights are described in the Digia Qt LGPL Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this package. - GNU General Public License Usage - Alternatively, this file may be used under the terms of the GNU - General Public License version 3.0 as published by the Free Software - Foundation and appearing in the file LICENSE.GPL included in the - packaging of this file. Please review the following information to - ensure the GNU General Public License version 3.0 requirements will be - met: http://www.gnu.org/copyleft/gpl.html. - - $QT_END_LICENSE$ ****************************************************************************/
[-] [+]	Changed	qtimageformats-5.4.1.tar.xz/src/plugins/imageformats/tga/qtgafile.h ^
@@ -1,40 +1,32 @@ /************************************************************************** - Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). + Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). Contact: http://www.qt-project.org/legal This file is part of the TGA plugin in the Qt ImageFormats module. - $QT_BEGIN_LICENSE:LGPL$ + $QT_BEGIN_LICENSE:LGPL21$ Commercial License Usage Licensees holding valid commercial Qt licenses may use this file in accordance with the commercial license agreement provided with the Software or, alternatively, in accordance with the terms contained in - a written agreement between you and Digia. For licensing terms and - conditions see http://qt.digia.com/licensing. For further information + a written agreement between you and Digia. For licensing terms and + conditions see http://qt.digia.com/licensing. For further information use the contact form at http://qt.digia.com/contact-us. GNU Lesser General Public License Usage Alternatively, this file may be used under the terms of the GNU Lesser - General Public License version 2.1 as published by the Free Software - Foundation and appearing in the file LICENSE.LGPL included in the - packaging of this file. Please review the following information to - ensure the GNU Lesser General Public License version 2.1 requirements - will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. + General Public License version 2.1 or version 3 as published by the Free + Software Foundation and appearing in the file LICENSE.LGPLv21 and + LICENSE.LGPLv3 included in the packaging of this file. Please review the + following information to ensure the GNU Lesser General Public License + requirements will be met: https://www.gnu.org/licenses/lgpl.html and + http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. In addition, as a special exception, Digia gives you certain additional - rights. These rights are described in the Digia Qt LGPL Exception + rights. These rights are described in the Digia Qt LGPL Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this package. - GNU General Public License Usage - Alternatively, this file may be used under the terms of the GNU - General Public License version 3.0 as published by the Free Software - Foundation and appearing in the file LICENSE.GPL included in the - packaging of this file. Please review the following information to - ensure the GNU General Public License version 3.0 requirements will be - met: http://www.gnu.org/copyleft/gpl.html. - - $QT_END_LICENSE$ ****************************************************************************/
[-] [+]	Changed	qtimageformats-5.4.1.tar.xz/src/plugins/imageformats/tga/qtgahandler.cpp ^
@@ -1,40 +1,32 @@ /************************************************************************** - Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). + Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). Contact: http://www.qt-project.org/legal This file is part of the TGA plugin in the Qt ImageFormats module. - $QT_BEGIN_LICENSE:LGPL$ + $QT_BEGIN_LICENSE:LGPL21$ Commercial License Usage Licensees holding valid commercial Qt licenses may use this file in accordance with the commercial license agreement provided with the Software or, alternatively, in accordance with the terms contained in - a written agreement between you and Digia. For licensing terms and - conditions see http://qt.digia.com/licensing. For further information + a written agreement between you and Digia. For licensing terms and + conditions see http://qt.digia.com/licensing. For further information use the contact form at http://qt.digia.com/contact-us. GNU Lesser General Public License Usage Alternatively, this file may be used under the terms of the GNU Lesser - General Public License version 2.1 as published by the Free Software - Foundation and appearing in the file LICENSE.LGPL included in the - packaging of this file. Please review the following information to - ensure the GNU Lesser General Public License version 2.1 requirements - will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. + General Public License version 2.1 or version 3 as published by the Free + Software Foundation and appearing in the file LICENSE.LGPLv21 and + LICENSE.LGPLv3 included in the packaging of this file. Please review the + following information to ensure the GNU Lesser General Public License + requirements will be met: https://www.gnu.org/licenses/lgpl.html and + http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. In addition, as a special exception, Digia gives you certain additional - rights. These rights are described in the Digia Qt LGPL Exception + rights. These rights are described in the Digia Qt LGPL Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this package. - GNU General Public License Usage - Alternatively, this file may be used under the terms of the GNU - General Public License version 3.0 as published by the Free Software - Foundation and appearing in the file LICENSE.GPL included in the - packaging of this file. Please review the following information to - ensure the GNU General Public License version 3.0 requirements will be - met: http://www.gnu.org/copyleft/gpl.html. - - $QT_END_LICENSE$ ****************************************************************************/
[-] [+]	Changed	qtimageformats-5.4.1.tar.xz/src/plugins/imageformats/tga/qtgahandler.h ^
@@ -1,40 +1,32 @@ /************************************************************************** - Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). + Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). Contact: http://www.qt-project.org/legal This file is part of the TGA plugin in the Qt ImageFormats module. - $QT_BEGIN_LICENSE:LGPL$ + $QT_BEGIN_LICENSE:LGPL21$ Commercial License Usage Licensees holding valid commercial Qt licenses may use this file in accordance with the commercial license agreement provided with the Software or, alternatively, in accordance with the terms contained in - a written agreement between you and Digia. For licensing terms and - conditions see http://qt.digia.com/licensing. For further information + a written agreement between you and Digia. For licensing terms and + conditions see http://qt.digia.com/licensing. For further information use the contact form at http://qt.digia.com/contact-us. GNU Lesser General Public License Usage Alternatively, this file may be used under the terms of the GNU Lesser - General Public License version 2.1 as published by the Free Software - Foundation and appearing in the file LICENSE.LGPL included in the - packaging of this file. Please review the following information to - ensure the GNU Lesser General Public License version 2.1 requirements - will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. + General Public License version 2.1 or version 3 as published by the Free + Software Foundation and appearing in the file LICENSE.LGPLv21 and + LICENSE.LGPLv3 included in the packaging of this file. Please review the + following information to ensure the GNU Lesser General Public License + requirements will be met: https://www.gnu.org/licenses/lgpl.html and + http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. In addition, as a special exception, Digia gives you certain additional - rights. These rights are described in the Digia Qt LGPL Exception + rights. These rights are described in the Digia Qt LGPL Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this package. - GNU General Public License Usage - Alternatively, this file may be used under the terms of the GNU - General Public License version 3.0 as published by the Free Software - Foundation and appearing in the file LICENSE.GPL included in the - packaging of this file. Please review the following information to - ensure the GNU General Public License version 3.0 requirements will be - met: http://www.gnu.org/copyleft/gpl.html. - - $QT_END_LICENSE$ ****************************************************************************/
[-] [+]	Changed	qtimageformats-5.4.1.tar.xz/src/plugins/imageformats/tiff/main.cpp ^
@@ -1,40 +1,32 @@ /************************************************************************** - Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). + Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). Contact: http://www.qt-project.org/legal This file is part of the plugins of the Qt Toolkit. - $QT_BEGIN_LICENSE:LGPL$ + $QT_BEGIN_LICENSE:LGPL21$ Commercial License Usage Licensees holding valid commercial Qt licenses may use this file in accordance with the commercial license agreement provided with the Software or, alternatively, in accordance with the terms contained in - a written agreement between you and Digia. For licensing terms and - conditions see http://qt.digia.com/licensing. For further information + a written agreement between you and Digia. For licensing terms and + conditions see http://qt.digia.com/licensing. For further information use the contact form at http://qt.digia.com/contact-us. GNU Lesser General Public License Usage Alternatively, this file may be used under the terms of the GNU Lesser - General Public License version 2.1 as published by the Free Software - Foundation and appearing in the file LICENSE.LGPL included in the - packaging of this file. Please review the following information to - ensure the GNU Lesser General Public License version 2.1 requirements - will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. + General Public License version 2.1 or version 3 as published by the Free + Software Foundation and appearing in the file LICENSE.LGPLv21 and + LICENSE.LGPLv3 included in the packaging of this file. Please review the + following information to ensure the GNU Lesser General Public License + requirements will be met: https://www.gnu.org/licenses/lgpl.html and + http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. In addition, as a special exception, Digia gives you certain additional - rights. These rights are described in the Digia Qt LGPL Exception + rights. These rights are described in the Digia Qt LGPL Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this package. - GNU General Public License Usage - Alternatively, this file may be used under the terms of the GNU - General Public License version 3.0 as published by the Free Software - Foundation and appearing in the file LICENSE.GPL included in the - packaging of this file. Please review the following information to - ensure the GNU General Public License version 3.0 requirements will be - met: http://www.gnu.org/copyleft/gpl.html. - - $QT_END_LICENSE$ ****************************************************************************/
[-] [+]	Changed	qtimageformats-5.4.1.tar.xz/src/plugins/imageformats/tiff/qfunctions_wince.cpp ^
@@ -1,40 +1,32 @@ /************************************************************************** - Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). + Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). Contact: http://www.qt-project.org/legal This file is part of the plugins of the Qt Toolkit. - $QT_BEGIN_LICENSE:LGPL$ + $QT_BEGIN_LICENSE:LGPL21$ Commercial License Usage Licensees holding valid commercial Qt licenses may use this file in accordance with the commercial license agreement provided with the Software or, alternatively, in accordance with the terms contained in - a written agreement between you and Digia. For licensing terms and - conditions see http://qt.digia.com/licensing. For further information + a written agreement between you and Digia. For licensing terms and + conditions see http://qt.digia.com/licensing. For further information use the contact form at http://qt.digia.com/contact-us. GNU Lesser General Public License Usage Alternatively, this file may be used under the terms of the GNU Lesser - General Public License version 2.1 as published by the Free Software - Foundation and appearing in the file LICENSE.LGPL included in the - packaging of this file. Please review the following information to - ensure the GNU Lesser General Public License version 2.1 requirements - will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. + General Public License version 2.1 or version 3 as published by the Free + Software Foundation and appearing in the file LICENSE.LGPLv21 and + LICENSE.LGPLv3 included in the packaging of this file. Please review the + following information to ensure the GNU Lesser General Public License + requirements will be met: https://www.gnu.org/licenses/lgpl.html and + http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. In addition, as a special exception, Digia gives you certain additional - rights. These rights are described in the Digia Qt LGPL Exception + rights. These rights are described in the Digia Qt LGPL Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this package. - GNU General Public License Usage - Alternatively, this file may be used under the terms of the GNU - General Public License version 3.0 as published by the Free Software - Foundation and appearing in the file LICENSE.GPL included in the - packaging of this file. Please review the following information to - ensure the GNU General Public License version 3.0 requirements will be - met: http://www.gnu.org/copyleft/gpl.html. - - $QT_END_LICENSE$ ****************************************************************************/
[-] [+]	Changed	qtimageformats-5.4.1.tar.xz/src/plugins/imageformats/tiff/qtiffhandler.cpp ^
@@ -1,40 +1,32 @@ /************************************************************************** - Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). + Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). Contact: http://www.qt-project.org/legal This file is part of the plugins of the Qt Toolkit. - $QT_BEGIN_LICENSE:LGPL$ + $QT_BEGIN_LICENSE:LGPL21$ Commercial License Usage Licensees holding valid commercial Qt licenses may use this file in accordance with the commercial license agreement provided with the Software or, alternatively, in accordance with the terms contained in - a written agreement between you and Digia. For licensing terms and - conditions see http://qt.digia.com/licensing. For further information + a written agreement between you and Digia. For licensing terms and + conditions see http://qt.digia.com/licensing. For further information use the contact form at http://qt.digia.com/contact-us. GNU Lesser General Public License Usage Alternatively, this file may be used under the terms of the GNU Lesser - General Public License version 2.1 as published by the Free Software - Foundation and appearing in the file LICENSE.LGPL included in the - packaging of this file. Please review the following information to - ensure the GNU Lesser General Public License version 2.1 requirements - will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. + General Public License version 2.1 or version 3 as published by the Free + Software Foundation and appearing in the file LICENSE.LGPLv21 and + LICENSE.LGPLv3 included in the packaging of this file. Please review the + following information to ensure the GNU Lesser General Public License + requirements will be met: https://www.gnu.org/licenses/lgpl.html and + http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. In addition, as a special exception, Digia gives you certain additional - rights. These rights are described in the Digia Qt LGPL Exception + rights. These rights are described in the Digia Qt LGPL Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this package. - GNU General Public License Usage - Alternatively, this file may be used under the terms of the GNU - General Public License version 3.0 as published by the Free Software - Foundation and appearing in the file LICENSE.GPL included in the - packaging of this file. Please review the following information to - ensure the GNU General Public License version 3.0 requirements will be - met: http://www.gnu.org/copyleft/gpl.html. - - $QT_END_LICENSE$ ***************************************************************************/ @@ -267,8 +259,12 @@ // free redTable, greenTable and greenTable done by libtiff } } else { - if (image->size() != QSize(width, height) \|\| image->format() != QImage::Format_ARGB32) - image = QImage(width, height, QImage::Format_ARGB32); + QImage::Format format = QImage::Format_ARGB32; + if (samplesPerPixel < 4 && image->format() != QImage::Format_ARGB32) + format = QImage::Format_RGB32; + + if (image->size() != QSize(width, height) \|\| image->format() != format) + image = QImage(width, height, format); if (!image->isNull()) { const int stopOnError = 1; if (TIFFReadRGBAImageOriented(tiff, width, height, reinterpret_cast<uint32 >(image->bits()), ORIENTATION_TOPLEFT, stopOnError)) { @@ -315,7 +311,7 @@ // rotate the image if the orientation is defined in the file uint16 orientationTag; if (TIFFGetField(tiff, TIFFTAG_ORIENTATION, &orientationTag)) { - if (image->format() == QImage::Format_ARGB32) { + if (image->format() == QImage::Format_ARGB32 \|\| image->format() == QImage::Format_RGB32) { // TIFFReadRGBAImageOriented() flip the image but does not rotate them switch (orientationTag) { case 5: @@ -552,6 +548,33 @@ } TIFFClose(tiff); + } else if (!image.hasAlphaChannel()) { + if (!TIFFSetField(tiff, TIFFTAG_PHOTOMETRIC, PHOTOMETRIC_RGB) + \|\| !TIFFSetField(tiff, TIFFTAG_COMPRESSION, compression == NoCompression ? COMPRESSION_NONE : COMPRESSION_LZW) + \|\| !TIFFSetField(tiff, TIFFTAG_SAMPLESPERPIXEL, 3) + \|\| !TIFFSetField(tiff, TIFFTAG_BITSPERSAMPLE, 8)) { + TIFFClose(tiff); + return false; + } + // try to do the RGB888 conversion in chunks no greater than 16 MB + const int chunks = (width * height * 3 / (1024 * 1024 * 16)) + 1; + const int chunkHeight = qMax(height / chunks, 1); + + int y = 0; + while (y < height) { + const QImage chunk = image.copy(0, y, width, qMin(chunkHeight, height - y)).convertToFormat(QImage::Format_RGB888); + + int chunkStart = y; + int chunkEnd = y + chunk.height(); + while (y < chunkEnd) { + if (TIFFWriteScanline(tiff, (void)chunk.scanLine(y - chunkStart), y) != 1) { + TIFFClose(tiff); + return false; + } + ++y; + } + } + TIFFClose(tiff); } else { if (!TIFFSetField(tiff, TIFFTAG_PHOTOMETRIC, PHOTOMETRIC_RGB) \|\| !TIFFSetField(tiff, TIFFTAG_COMPRESSION, compression == NoCompression ? COMPRESSION_NONE : COMPRESSION_LZW) @@ -561,17 +584,17 @@ return false; } // try to do the RGBA8888 conversion in chunks no greater than 16 MB - int chunks = (width height * 4 / (1024 * 1024 * 16)) + 1; - int chunkHeight = qMax(height / chunks, 1); + const int chunks = (width * height * 4 / (1024 * 1024 * 16)) + 1; + const int chunkHeight = qMax(height / chunks, 1); int y = 0; while (y < height) { - QImage chunk = image.copy(0, y, width, qMin(chunkHeight, height - y)).convertToFormat(QImage::Format_RGBA8888); + const QImage chunk = image.copy(0, y, width, qMin(chunkHeight, height - y)).convertToFormat(QImage::Format_RGBA8888); int chunkStart = y; int chunkEnd = y + chunk.height(); while (y < chunkEnd) { - if (TIFFWriteScanline(tiff, reinterpret_cast<uint32 >(chunk.scanLine(y - chunkStart)), y) != 1) { + if (TIFFWriteScanline(tiff, (void)chunk.scanLine(y - chunkStart), y) != 1) { TIFFClose(tiff); return false; }
[-] [+]	Changed	qtimageformats-5.4.1.tar.xz/src/plugins/imageformats/tiff/qtiffhandler_p.h ^
@@ -1,40 +1,32 @@ /************************************************************************** - Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). + Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). Contact: http://www.qt-project.org/legal This file is part of the plugins of the Qt Toolkit. - $QT_BEGIN_LICENSE:LGPL$ + $QT_BEGIN_LICENSE:LGPL21$ Commercial License Usage Licensees holding valid commercial Qt licenses may use this file in accordance with the commercial license agreement provided with the Software or, alternatively, in accordance with the terms contained in - a written agreement between you and Digia. For licensing terms and - conditions see http://qt.digia.com/licensing. For further information + a written agreement between you and Digia. For licensing terms and + conditions see http://qt.digia.com/licensing. For further information use the contact form at http://qt.digia.com/contact-us. GNU Lesser General Public License Usage Alternatively, this file may be used under the terms of the GNU Lesser - General Public License version 2.1 as published by the Free Software - Foundation and appearing in the file LICENSE.LGPL included in the - packaging of this file. Please review the following information to - ensure the GNU Lesser General Public License version 2.1 requirements - will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. + General Public License version 2.1 or version 3 as published by the Free + Software Foundation and appearing in the file LICENSE.LGPLv21 and + LICENSE.LGPLv3 included in the packaging of this file. Please review the + following information to ensure the GNU Lesser General Public License + requirements will be met: https://www.gnu.org/licenses/lgpl.html and + http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. In addition, as a special exception, Digia gives you certain additional - rights. These rights are described in the Digia Qt LGPL Exception + rights. These rights are described in the Digia Qt LGPL Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this package. - GNU General Public License Usage - Alternatively, this file may be used under the terms of the GNU - General Public License version 3.0 as published by the Free Software - Foundation and appearing in the file LICENSE.GPL included in the - packaging of this file. Please review the following information to - ensure the GNU General Public License version 3.0 requirements will be - met: http://www.gnu.org/copyleft/gpl.html. - - $QT_END_LICENSE$ ****************************************************************************/
[-] [+]	Changed	qtimageformats-5.4.1.tar.xz/src/plugins/imageformats/wbmp/main.cpp ^
@@ -1,40 +1,32 @@ /************************************************************************** - Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). + Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). Contact: http://www.qt-project.org/legal This file is part of the WBMP plugin in the Qt ImageFormats module. - $QT_BEGIN_LICENSE:LGPL$ + $QT_BEGIN_LICENSE:LGPL21$ Commercial License Usage Licensees holding valid commercial Qt licenses may use this file in accordance with the commercial license agreement provided with the Software or, alternatively, in accordance with the terms contained in - a written agreement between you and Digia. For licensing terms and - conditions see http://qt.digia.com/licensing. For further information + a written agreement between you and Digia. For licensing terms and + conditions see http://qt.digia.com/licensing. For further information use the contact form at http://qt.digia.com/contact-us. GNU Lesser General Public License Usage Alternatively, this file may be used under the terms of the GNU Lesser - General Public License version 2.1 as published by the Free Software - Foundation and appearing in the file LICENSE.LGPL included in the - packaging of this file. Please review the following information to - ensure the GNU Lesser General Public License version 2.1 requirements - will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. + General Public License version 2.1 or version 3 as published by the Free + Software Foundation and appearing in the file LICENSE.LGPLv21 and + LICENSE.LGPLv3 included in the packaging of this file. Please review the + following information to ensure the GNU Lesser General Public License + requirements will be met: https://www.gnu.org/licenses/lgpl.html and + http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. In addition, as a special exception, Digia gives you certain additional - rights. These rights are described in the Digia Qt LGPL Exception + rights. These rights are described in the Digia Qt LGPL Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this package. - GNU General Public License Usage - Alternatively, this file may be used under the terms of the GNU - General Public License version 3.0 as published by the Free Software - Foundation and appearing in the file LICENSE.GPL included in the - packaging of this file. Please review the following information to - ensure the GNU General Public License version 3.0 requirements will be - met: http://www.gnu.org/copyleft/gpl.html. - - $QT_END_LICENSE$ ****************************************************************************/
[-] [+]	Changed	qtimageformats-5.4.1.tar.xz/src/plugins/imageformats/wbmp/qwbmphandler.cpp ^
@@ -1,40 +1,32 @@ /************************************************************************** - Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). + Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). Contact: http://www.qt-project.org/legal This file is part of the WBMP plugin in the Qt ImageFormats module. - $QT_BEGIN_LICENSE:LGPL$ + $QT_BEGIN_LICENSE:LGPL21$ Commercial License Usage Licensees holding valid commercial Qt licenses may use this file in accordance with the commercial license agreement provided with the Software or, alternatively, in accordance with the terms contained in - a written agreement between you and Digia. For licensing terms and - conditions see http://qt.digia.com/licensing. For further information + a written agreement between you and Digia. For licensing terms and + conditions see http://qt.digia.com/licensing. For further information use the contact form at http://qt.digia.com/contact-us. GNU Lesser General Public License Usage Alternatively, this file may be used under the terms of the GNU Lesser - General Public License version 2.1 as published by the Free Software - Foundation and appearing in the file LICENSE.LGPL included in the - packaging of this file. Please review the following information to - ensure the GNU Lesser General Public License version 2.1 requirements - will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. + General Public License version 2.1 or version 3 as published by the Free + Software Foundation and appearing in the file LICENSE.LGPLv21 and + LICENSE.LGPLv3 included in the packaging of this file. Please review the + following information to ensure the GNU Lesser General Public License + requirements will be met: https://www.gnu.org/licenses/lgpl.html and + http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. In addition, as a special exception, Digia gives you certain additional - rights. These rights are described in the Digia Qt LGPL Exception + rights. These rights are described in the Digia Qt LGPL Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this package. - GNU General Public License Usage - Alternatively, this file may be used under the terms of the GNU - General Public License version 3.0 as published by the Free Software - Foundation and appearing in the file LICENSE.GPL included in the - packaging of this file. Please review the following information to - ensure the GNU General Public License version 3.0 requirements will be - met: http://www.gnu.org/copyleft/gpl.html. - - $QT_END_LICENSE$ ****************************************************************************/
[-] [+]	Changed	qtimageformats-5.4.1.tar.xz/src/plugins/imageformats/wbmp/qwbmphandler_p.h ^
@@ -1,40 +1,32 @@ /************************************************************************** - Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). + Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). Contact: http://www.qt-project.org/legal This file is part of the WBMP plugin in the Qt ImageFormats module. - $QT_BEGIN_LICENSE:LGPL$ + $QT_BEGIN_LICENSE:LGPL21$ Commercial License Usage Licensees holding valid commercial Qt licenses may use this file in accordance with the commercial license agreement provided with the Software or, alternatively, in accordance with the terms contained in - a written agreement between you and Digia. For licensing terms and - conditions see http://qt.digia.com/licensing. For further information + a written agreement between you and Digia. For licensing terms and + conditions see http://qt.digia.com/licensing. For further information use the contact form at http://qt.digia.com/contact-us. GNU Lesser General Public License Usage Alternatively, this file may be used under the terms of the GNU Lesser - General Public License version 2.1 as published by the Free Software - Foundation and appearing in the file LICENSE.LGPL included in the - packaging of this file. Please review the following information to - ensure the GNU Lesser General Public License version 2.1 requirements - will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. + General Public License version 2.1 or version 3 as published by the Free + Software Foundation and appearing in the file LICENSE.LGPLv21 and + LICENSE.LGPLv3 included in the packaging of this file. Please review the + following information to ensure the GNU Lesser General Public License + requirements will be met: https://www.gnu.org/licenses/lgpl.html and + http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. In addition, as a special exception, Digia gives you certain additional - rights. These rights are described in the Digia Qt LGPL Exception + rights. These rights are described in the Digia Qt LGPL Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this package. - GNU General Public License Usage - Alternatively, this file may be used under the terms of the GNU - General Public License version 3.0 as published by the Free Software - Foundation and appearing in the file LICENSE.GPL included in the - packaging of this file. Please review the following information to - ensure the GNU General Public License version 3.0 requirements will be - met: http://www.gnu.org/copyleft/gpl.html. - - $QT_END_LICENSE$ ****************************************************************************/
[-] [+]	Changed	qtimageformats-5.4.1.tar.xz/src/plugins/imageformats/webp/main.cpp ^
@@ -1,40 +1,32 @@ /************************************************************************** - Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). + Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). Contact: http://www.qt-project.org/legal This file is part of the WebP plugins in the Qt ImageFormats module. - $QT_BEGIN_LICENSE:LGPL$ + $QT_BEGIN_LICENSE:LGPL21$ Commercial License Usage Licensees holding valid commercial Qt licenses may use this file in accordance with the commercial license agreement provided with the Software or, alternatively, in accordance with the terms contained in - a written agreement between you and Digia. For licensing terms and - conditions see http://qt.digia.com/licensing. For further information + a written agreement between you and Digia. For licensing terms and + conditions see http://qt.digia.com/licensing. For further information use the contact form at http://qt.digia.com/contact-us. GNU Lesser General Public License Usage Alternatively, this file may be used under the terms of the GNU Lesser - General Public License version 2.1 as published by the Free Software - Foundation and appearing in the file LICENSE.LGPL included in the - packaging of this file. Please review the following information to - ensure the GNU Lesser General Public License version 2.1 requirements - will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. + General Public License version 2.1 or version 3 as published by the Free + Software Foundation and appearing in the file LICENSE.LGPLv21 and + LICENSE.LGPLv3 included in the packaging of this file. Please review the + following information to ensure the GNU Lesser General Public License + requirements will be met: https://www.gnu.org/licenses/lgpl.html and + http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. In addition, as a special exception, Digia gives you certain additional - rights. These rights are described in the Digia Qt LGPL Exception + rights. These rights are described in the Digia Qt LGPL Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this package. - GNU General Public License Usage - Alternatively, this file may be used under the terms of the GNU - General Public License version 3.0 as published by the Free Software - Foundation and appearing in the file LICENSE.GPL included in the - packaging of this file. Please review the following information to - ensure the GNU General Public License version 3.0 requirements will be - met: http://www.gnu.org/copyleft/gpl.html. - - $QT_END_LICENSE$ ****************************************************************************/
[-] [+]	Changed	qtimageformats-5.4.1.tar.xz/src/plugins/imageformats/webp/qwebphandler.cpp ^
@@ -1,40 +1,32 @@ /************************************************************************** - Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). + Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). Contact: http://www.qt-project.org/legal This file is part of the WebP plugins in the Qt ImageFormats module. - $QT_BEGIN_LICENSE:LGPL$ + $QT_BEGIN_LICENSE:LGPL21$ Commercial License Usage Licensees holding valid commercial Qt licenses may use this file in accordance with the commercial license agreement provided with the Software or, alternatively, in accordance with the terms contained in - a written agreement between you and Digia. For licensing terms and - conditions see http://qt.digia.com/licensing. For further information + a written agreement between you and Digia. For licensing terms and + conditions see http://qt.digia.com/licensing. For further information use the contact form at http://qt.digia.com/contact-us. GNU Lesser General Public License Usage Alternatively, this file may be used under the terms of the GNU Lesser - General Public License version 2.1 as published by the Free Software - Foundation and appearing in the file LICENSE.LGPL included in the - packaging of this file. Please review the following information to - ensure the GNU Lesser General Public License version 2.1 requirements - will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. + General Public License version 2.1 or version 3 as published by the Free + Software Foundation and appearing in the file LICENSE.LGPLv21 and + LICENSE.LGPLv3 included in the packaging of this file. Please review the + following information to ensure the GNU Lesser General Public License + requirements will be met: https://www.gnu.org/licenses/lgpl.html and + http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. In addition, as a special exception, Digia gives you certain additional - rights. These rights are described in the Digia Qt LGPL Exception + rights. These rights are described in the Digia Qt LGPL Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this package. - GNU General Public License Usage - Alternatively, this file may be used under the terms of the GNU - General Public License version 3.0 as published by the Free Software - Foundation and appearing in the file LICENSE.GPL included in the - packaging of this file. Please review the following information to - ensure the GNU General Public License version 3.0 requirements will be - met: http://www.gnu.org/copyleft/gpl.html. - - $QT_END_LICENSE$ ****************************************************************************/
[-] [+]	Changed	qtimageformats-5.4.1.tar.xz/src/plugins/imageformats/webp/qwebphandler_p.h ^
@@ -1,40 +1,32 @@ /************************************************************************** - Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). + Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). Contact: http://www.qt-project.org/legal This file is part of the WebP plugins in the Qt ImageFormats module. - $QT_BEGIN_LICENSE:LGPL$ + $QT_BEGIN_LICENSE:LGPL21$ Commercial License Usage Licensees holding valid commercial Qt licenses may use this file in accordance with the commercial license agreement provided with the Software or, alternatively, in accordance with the terms contained in - a written agreement between you and Digia. For licensing terms and - conditions see http://qt.digia.com/licensing. For further information + a written agreement between you and Digia. For licensing terms and + conditions see http://qt.digia.com/licensing. For further information use the contact form at http://qt.digia.com/contact-us. GNU Lesser General Public License Usage Alternatively, this file may be used under the terms of the GNU Lesser - General Public License version 2.1 as published by the Free Software - Foundation and appearing in the file LICENSE.LGPL included in the - packaging of this file. Please review the following information to - ensure the GNU Lesser General Public License version 2.1 requirements - will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. + General Public License version 2.1 or version 3 as published by the Free + Software Foundation and appearing in the file LICENSE.LGPLv21 and + LICENSE.LGPLv3 included in the packaging of this file. Please review the + following information to ensure the GNU Lesser General Public License + requirements will be met: https://www.gnu.org/licenses/lgpl.html and + http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. In addition, as a special exception, Digia gives you certain additional - rights. These rights are described in the Digia Qt LGPL Exception + rights. These rights are described in the Digia Qt LGPL Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this package. - GNU General Public License Usage - Alternatively, this file may be used under the terms of the GNU - General Public License version 3.0 as published by the Free Software - Foundation and appearing in the file LICENSE.GPL included in the - packaging of this file. Please review the following information to - ensure the GNU General Public License version 3.0 requirements will be - met: http://www.gnu.org/copyleft/gpl.html. - - $QT_END_LICENSE$ ****************************************************************************/
[-] [+]	Changed	qtimageformats-5.4.1.tar.xz/tests/auto/dds/tst_qdds.cpp ^
@@ -1,41 +1,33 @@ /************************************************************************** - Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). + Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). Copyright (C) 2013 Ivan Komissarov. Contact: http://www.qt-project.org/legal This file is part of the DDS plugin in the Qt ImageFormats module. - $QT_BEGIN_LICENSE:LGPL$ + $QT_BEGIN_LICENSE:LGPL21$ Commercial License Usage Licensees holding valid commercial Qt licenses may use this file in accordance with the commercial license agreement provided with the Software or, alternatively, in accordance with the terms contained in - a written agreement between you and Digia. For licensing terms and - conditions see http://qt.digia.com/licensing. For further information + a written agreement between you and Digia. For licensing terms and + conditions see http://qt.digia.com/licensing. For further information use the contact form at http://qt.digia.com/contact-us. GNU Lesser General Public License Usage Alternatively, this file may be used under the terms of the GNU Lesser - General Public License version 2.1 as published by the Free Software - Foundation and appearing in the file LICENSE.LGPL included in the - packaging of this file. Please review the following information to - ensure the GNU Lesser General Public License version 2.1 requirements - will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. + General Public License version 2.1 or version 3 as published by the Free + Software Foundation and appearing in the file LICENSE.LGPLv21 and + LICENSE.LGPLv3 included in the packaging of this file. Please review the + following information to ensure the GNU Lesser General Public License + requirements will be met: https://www.gnu.org/licenses/lgpl.html and + http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. In addition, as a special exception, Digia gives you certain additional - rights. These rights are described in the Digia Qt LGPL Exception + rights. These rights are described in the Digia Qt LGPL Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this package. - GNU General Public License Usage - Alternatively, this file may be used under the terms of the GNU - General Public License version 3.0 as published by the Free Software - Foundation and appearing in the file LICENSE.GPL included in the - packaging of this file. Please review the following information to - ensure the GNU General Public License version 3.0 requirements will be - met: http://www.gnu.org/copyleft/gpl.html. - - $QT_END_LICENSE$ **************************************************************************/ @@ -109,7 +101,7 @@ QTest::newRow("46") << QString("RXGB") << QSize(64, 64); QTest::newRow("47") << QString("ATI2") << QSize(64, 64); QTest::newRow("48") << QString("P4") << QSize(64, 64); - QTest::newRow("49") << QString("A8R8G8B8_2") << QSize(64, 32); + QTest::newRow("49") << QString("A8R8G8B8.2") << QSize(64, 32); } void tst_qdds::readImage() @@ -118,8 +110,12 @@ QFETCH(QSize, size); const QString path = QStringLiteral(":/dds/") + fileName + QStringLiteral(".dds"); + const QByteArray subType = fileName.left(fileName.lastIndexOf(QLatin1Char('.'))).toLatin1(); QImageReader reader(path); QVERIFY(reader.canRead()); + QVERIFY(reader.supportsOption(QImageIOHandler::SubType)); + QCOMPARE(reader.subType(), subType); + QVERIFY(reader.supportsOption(QImageIOHandler::SupportedSubTypes)); QImage image = reader.read(); QVERIFY2(!image.isNull(), qPrintable(reader.errorString())); QCOMPARE(image.size(), size); @@ -159,7 +155,7 @@ QTest::addColumn<QSize>("size"); QTest::newRow("1") << QString("A8R8G8B8") << QSize(64, 64); - QTest::newRow("2") << QString("A8R8G8B8_2") << QSize(64, 32); + QTest::newRow("2") << QString("A8R8G8B8.2") << QSize(64, 32); } void tst_qdds::testWriteImage() @@ -169,6 +165,7 @@ const QString path = fileName + QStringLiteral(".dds"); const QString sourcePath = QStringLiteral(":/dds/") + fileName + QStringLiteral(".dds"); + const QByteArray subType = fileName.left(fileName.lastIndexOf(QLatin1Char('.'))).toLatin1(); QImage image(sourcePath); QVERIFY(!image.isNull()); @@ -176,9 +173,15 @@ QImageWriter writer(path, QByteArrayLiteral("dds")); QVERIFY2(writer.canWrite(), qPrintable(writer.errorString())); + writer.setSubType(subType); QVERIFY2(writer.write(image), qPrintable(writer.errorString())); QVERIFY(image == QImage(path)); + + QImageReader reader(path); + QVERIFY(reader.canRead()); + QCOMPARE(reader.size(), size); + QCOMPARE(reader.subType(), subType); } QTEST_MAIN(tst_qdds)
[-] [+]	Changed	qtimageformats-5.4.1.tar.xz/tests/auto/icns/tst_qicns.cpp ^
@@ -1,41 +1,33 @@ /************************************************************************** - Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). + Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). Copyright (C) 2013 Alex Char. Contact: http://www.qt-project.org/legal This file is part of the ICNS autotests in the Qt ImageFormats module. - $QT_BEGIN_LICENSE:LGPL$ + $QT_BEGIN_LICENSE:LGPL21$ Commercial License Usage Licensees holding valid commercial Qt licenses may use this file in accordance with the commercial license agreement provided with the Software or, alternatively, in accordance with the terms contained in - a written agreement between you and Digia. For licensing terms and - conditions see http://qt.digia.com/licensing. For further information + a written agreement between you and Digia. For licensing terms and + conditions see http://qt.digia.com/licensing. For further information use the contact form at http://qt.digia.com/contact-us. GNU Lesser General Public License Usage Alternatively, this file may be used under the terms of the GNU Lesser - General Public License version 2.1 as published by the Free Software - Foundation and appearing in the file LICENSE.LGPL included in the - packaging of this file. Please review the following information to - ensure the GNU Lesser General Public License version 2.1 requirements - will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. + General Public License version 2.1 or version 3 as published by the Free + Software Foundation and appearing in the file LICENSE.LGPLv21 and + LICENSE.LGPLv3 included in the packaging of this file. Please review the + following information to ensure the GNU Lesser General Public License + requirements will be met: https://www.gnu.org/licenses/lgpl.html and + http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. In addition, as a special exception, Digia gives you certain additional - rights. These rights are described in the Digia Qt LGPL Exception + rights. These rights are described in the Digia Qt LGPL Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this package. - GNU General Public License Usage - Alternatively, this file may be used under the terms of the GNU - General Public License version 3.0 as published by the Free Software - Foundation and appearing in the file LICENSE.GPL included in the - packaging of this file. Please review the following information to - ensure the GNU General Public License version 3.0 requirements will be - met: http://www.gnu.org/copyleft/gpl.html. - - $QT_END_LICENSE$ **************************************************************************/ @@ -65,6 +57,7 @@ QTest::newRow("2") << QStringLiteral("test-jp2") << QSize(128, 128) << 7 << QByteArrayLiteral("jp2"); QTest::newRow("3") << QStringLiteral("test-32bit") << QSize(128, 128) << 4 << QByteArray(); QTest::newRow("4") << QStringLiteral("test-legacy") << QSize(48, 48) << 12 << QByteArray(); + QTest::newRow("5") << QStringLiteral("test-variants") << QSize(128, 128) << 5 << QByteArrayLiteral("png"); } void tst_qicns::readIcons()
[-] [+]	Changed	qtimageformats-5.4.1.tar.xz/tests/auto/jp2/tst_qjp2.cpp ^
@@ -6,36 +6,28 @@ This file is part of the MNG autotests in the Qt ImageFormats module. - $QT_BEGIN_LICENSE:LGPL$ + $QT_BEGIN_LICENSE:LGPL21$ Commercial License Usage Licensees holding valid commercial Qt licenses may use this file in accordance with the commercial license agreement provided with the Software or, alternatively, in accordance with the terms contained in - a written agreement between you and Digia. For licensing terms and - conditions see http://qt.digia.com/licensing. For further information + a written agreement between you and Digia. For licensing terms and + conditions see http://qt.digia.com/licensing. For further information use the contact form at http://qt.digia.com/contact-us. GNU Lesser General Public License Usage Alternatively, this file may be used under the terms of the GNU Lesser - General Public License version 2.1 as published by the Free Software - Foundation and appearing in the file LICENSE.LGPL included in the - packaging of this file. Please review the following information to - ensure the GNU Lesser General Public License version 2.1 requirements - will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. + General Public License version 2.1 or version 3 as published by the Free + Software Foundation and appearing in the file LICENSE.LGPLv21 and + LICENSE.LGPLv3 included in the packaging of this file. Please review the + following information to ensure the GNU Lesser General Public License + requirements will be met: https://www.gnu.org/licenses/lgpl.html and + http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. In addition, as a special exception, Digia gives you certain additional - rights. These rights are described in the Digia Qt LGPL Exception + rights. These rights are described in the Digia Qt LGPL Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this package. - GNU General Public License Usage - Alternatively, this file may be used under the terms of the GNU - General Public License version 3.0 as published by the Free Software - Foundation and appearing in the file LICENSE.GPL included in the - packaging of this file. Please review the following information to - ensure the GNU General Public License version 3.0 requirements will be - met: http://www.gnu.org/copyleft/gpl.html. - - $QT_END_LICENSE$ **************************************************************************/
[-] [+]	Changed	qtimageformats-5.4.1.tar.xz/tests/auto/mng/tst_qmng.cpp ^
@@ -1,40 +1,32 @@ /************************************************************************** - Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). + Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). Contact: http://www.qt-project.org/legal This file is part of the MNG autotests in the Qt ImageFormats module. - $QT_BEGIN_LICENSE:LGPL$ + $QT_BEGIN_LICENSE:LGPL21$ Commercial License Usage Licensees holding valid commercial Qt licenses may use this file in accordance with the commercial license agreement provided with the Software or, alternatively, in accordance with the terms contained in - a written agreement between you and Digia. For licensing terms and - conditions see http://qt.digia.com/licensing. For further information + a written agreement between you and Digia. For licensing terms and + conditions see http://qt.digia.com/licensing. For further information use the contact form at http://qt.digia.com/contact-us. GNU Lesser General Public License Usage Alternatively, this file may be used under the terms of the GNU Lesser - General Public License version 2.1 as published by the Free Software - Foundation and appearing in the file LICENSE.LGPL included in the - packaging of this file. Please review the following information to - ensure the GNU Lesser General Public License version 2.1 requirements - will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. + General Public License version 2.1 or version 3 as published by the Free + Software Foundation and appearing in the file LICENSE.LGPLv21 and + LICENSE.LGPLv3 included in the packaging of this file. Please review the + following information to ensure the GNU Lesser General Public License + requirements will be met: https://www.gnu.org/licenses/lgpl.html and + http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. In addition, as a special exception, Digia gives you certain additional - rights. These rights are described in the Digia Qt LGPL Exception + rights. These rights are described in the Digia Qt LGPL Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this package. - GNU General Public License Usage - Alternatively, this file may be used under the terms of the GNU - General Public License version 3.0 as published by the Free Software - Foundation and appearing in the file LICENSE.GPL included in the - packaging of this file. Please review the following information to - ensure the GNU General Public License version 3.0 requirements will be - met: http://www.gnu.org/copyleft/gpl.html. - - $QT_END_LICENSE$ ****************************************************************************/
[-] [+]	Changed	qtimageformats-5.4.1.tar.xz/tests/auto/tga/tst_qtga.cpp ^
@@ -1,40 +1,32 @@ /************************************************************************** - Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). + Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). Contact: http://www.qt-project.org/legal This file is part of the TGA autotests in the Qt ImageFormats module. - $QT_BEGIN_LICENSE:LGPL$ + $QT_BEGIN_LICENSE:LGPL21$ Commercial License Usage Licensees holding valid commercial Qt licenses may use this file in accordance with the commercial license agreement provided with the Software or, alternatively, in accordance with the terms contained in - a written agreement between you and Digia. For licensing terms and - conditions see http://qt.digia.com/licensing. For further information + a written agreement between you and Digia. For licensing terms and + conditions see http://qt.digia.com/licensing. For further information use the contact form at http://qt.digia.com/contact-us. GNU Lesser General Public License Usage Alternatively, this file may be used under the terms of the GNU Lesser - General Public License version 2.1 as published by the Free Software - Foundation and appearing in the file LICENSE.LGPL included in the - packaging of this file. Please review the following information to - ensure the GNU Lesser General Public License version 2.1 requirements - will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. + General Public License version 2.1 or version 3 as published by the Free + Software Foundation and appearing in the file LICENSE.LGPLv21 and + LICENSE.LGPLv3 included in the packaging of this file. Please review the + following information to ensure the GNU Lesser General Public License + requirements will be met: https://www.gnu.org/licenses/lgpl.html and + http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. In addition, as a special exception, Digia gives you certain additional - rights. These rights are described in the Digia Qt LGPL Exception + rights. These rights are described in the Digia Qt LGPL Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this package. - GNU General Public License Usage - Alternatively, this file may be used under the terms of the GNU - General Public License version 3.0 as published by the Free Software - Foundation and appearing in the file LICENSE.GPL included in the - packaging of this file. Please review the following information to - ensure the GNU General Public License version 3.0 requirements will be - met: http://www.gnu.org/copyleft/gpl.html. - - $QT_END_LICENSE$ ****************************************************************************/
[-] [+]	Changed	qtimageformats-5.4.1.tar.xz/tests/auto/tiff/tst_qtiff.cpp ^
@@ -1,40 +1,32 @@ /************************************************************************** - Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). + Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). Contact: http://www.qt-project.org/legal This file is part of the QtAddOn.ImageFormats module of the Qt Toolkit. - $QT_BEGIN_LICENSE:LGPL$ + $QT_BEGIN_LICENSE:LGPL21$ Commercial License Usage Licensees holding valid commercial Qt licenses may use this file in accordance with the commercial license agreement provided with the Software or, alternatively, in accordance with the terms contained in - a written agreement between you and Digia. For licensing terms and - conditions see http://qt.digia.com/licensing. For further information + a written agreement between you and Digia. For licensing terms and + conditions see http://qt.digia.com/licensing. For further information use the contact form at http://qt.digia.com/contact-us. GNU Lesser General Public License Usage Alternatively, this file may be used under the terms of the GNU Lesser - General Public License version 2.1 as published by the Free Software - Foundation and appearing in the file LICENSE.LGPL included in the - packaging of this file. Please review the following information to - ensure the GNU Lesser General Public License version 2.1 requirements - will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. + General Public License version 2.1 or version 3 as published by the Free + Software Foundation and appearing in the file LICENSE.LGPLv21 and + LICENSE.LGPLv3 included in the packaging of this file. Please review the + following information to ensure the GNU Lesser General Public License + requirements will be met: https://www.gnu.org/licenses/lgpl.html and + http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. In addition, as a special exception, Digia gives you certain additional - rights. These rights are described in the Digia Qt LGPL Exception + rights. These rights are described in the Digia Qt LGPL Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this package. - GNU General Public License Usage - Alternatively, this file may be used under the terms of the GNU - General Public License version 3.0 as published by the Free Software - Foundation and appearing in the file LICENSE.GPL included in the - packaging of this file. Please review the following information to - ensure the GNU General Public License version 3.0 requirements will be - met: http://www.gnu.org/copyleft/gpl.html. - - $QT_END_LICENSE$ ****************************************************************************/ @@ -374,7 +366,8 @@ QTest::addColumn<bool>("grayscale"); QTest::newRow("tiff mono") << QImage::Format_Mono << QImage::Format_Mono << false; QTest::newRow("tiff indexed") << QImage::Format_Indexed8 << QImage::Format_Indexed8 << false; - QTest::newRow("tiff rgb32") << QImage::Format_ARGB32 << QImage::Format_ARGB32 << false; + QTest::newRow("tiff argb32") << QImage::Format_ARGB32 << QImage::Format_ARGB32 << false; + QTest::newRow("tiff rgb32") << QImage::Format_RGB32 << QImage::Format_RGB32 << false; QTest::newRow("tiff grayscale") << QImage::Format_Indexed8 << QImage::Format_Indexed8 << true; }
[-] [+]	Changed	qtimageformats-5.4.1.tar.xz/tests/auto/wbmp/tst_qwbmp.cpp ^
@@ -1,40 +1,32 @@ /************************************************************************** - Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). + Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). Contact: http://www.qt-project.org/legal This file is part of the WBMP plugin in the Qt ImageFormats module. - $QT_BEGIN_LICENSE:LGPL$ + $QT_BEGIN_LICENSE:LGPL21$ Commercial License Usage Licensees holding valid commercial Qt licenses may use this file in accordance with the commercial license agreement provided with the Software or, alternatively, in accordance with the terms contained in - a written agreement between you and Digia. For licensing terms and - conditions see http://qt.digia.com/licensing. For further information + a written agreement between you and Digia. For licensing terms and + conditions see http://qt.digia.com/licensing. For further information use the contact form at http://qt.digia.com/contact-us. GNU Lesser General Public License Usage Alternatively, this file may be used under the terms of the GNU Lesser - General Public License version 2.1 as published by the Free Software - Foundation and appearing in the file LICENSE.LGPL included in the - packaging of this file. Please review the following information to - ensure the GNU Lesser General Public License version 2.1 requirements - will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. + General Public License version 2.1 or version 3 as published by the Free + Software Foundation and appearing in the file LICENSE.LGPLv21 and + LICENSE.LGPLv3 included in the packaging of this file. Please review the + following information to ensure the GNU Lesser General Public License + requirements will be met: https://www.gnu.org/licenses/lgpl.html and + http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. In addition, as a special exception, Digia gives you certain additional - rights. These rights are described in the Digia Qt LGPL Exception + rights. These rights are described in the Digia Qt LGPL Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this package. - GNU General Public License Usage - Alternatively, this file may be used under the terms of the GNU - General Public License version 3.0 as published by the Free Software - Foundation and appearing in the file LICENSE.GPL included in the - packaging of this file. Please review the following information to - ensure the GNU General Public License version 3.0 requirements will be - met: http://www.gnu.org/copyleft/gpl.html. - - $QT_END_LICENSE$ ****************************************************************************/
[-] [+]	Changed	qtimageformats-5.4.1.tar.xz/tests/auto/webp/tst_qwebp.cpp ^
@@ -1,40 +1,32 @@ /************************************************************************** - Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). + Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). Contact: http://www.qt-project.org/legal This file is part of the QtAddOn.ImageFormats module of the Qt Toolkit. - $QT_BEGIN_LICENSE:LGPL$ + $QT_BEGIN_LICENSE:LGPL21$ Commercial License Usage Licensees holding valid commercial Qt licenses may use this file in accordance with the commercial license agreement provided with the Software or, alternatively, in accordance with the terms contained in - a written agreement between you and Digia. For licensing terms and - conditions see http://qt.digia.com/licensing. For further information + a written agreement between you and Digia. For licensing terms and + conditions see http://qt.digia.com/licensing. For further information use the contact form at http://qt.digia.com/contact-us. GNU Lesser General Public License Usage Alternatively, this file may be used under the terms of the GNU Lesser - General Public License version 2.1 as published by the Free Software - Foundation and appearing in the file LICENSE.LGPL included in the - packaging of this file. Please review the following information to - ensure the GNU Lesser General Public License version 2.1 requirements - will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. + General Public License version 2.1 or version 3 as published by the Free + Software Foundation and appearing in the file LICENSE.LGPLv21 and + LICENSE.LGPLv3 included in the packaging of this file. Please review the + following information to ensure the GNU Lesser General Public License + requirements will be met: https://www.gnu.org/licenses/lgpl.html and + http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. In addition, as a special exception, Digia gives you certain additional - rights. These rights are described in the Digia Qt LGPL Exception + rights. These rights are described in the Digia Qt LGPL Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this package. - GNU General Public License Usage - Alternatively, this file may be used under the terms of the GNU - General Public License version 3.0 as published by the Free Software - Foundation and appearing in the file LICENSE.GPL included in the - packaging of this file. Please review the following information to - ensure the GNU General Public License version 3.0 requirements will be - met: http://www.gnu.org/copyleft/gpl.html. - - $QT_END_LICENSE$ ****************************************************************************/
[-] [+]	Changed	qtimageformats-5.4.1.tar.xz/tests/benchmarks/mng/tst_qmng.cpp ^
@@ -1,40 +1,32 @@ /************************************************************************** - Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). + Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). Contact: http://www.qt-project.org/legal This file is part of the MNG benchmarks in the Qt ImageFormats module. - $QT_BEGIN_LICENSE:LGPL$ + $QT_BEGIN_LICENSE:LGPL21$ Commercial License Usage Licensees holding valid commercial Qt licenses may use this file in accordance with the commercial license agreement provided with the Software or, alternatively, in accordance with the terms contained in - a written agreement between you and Digia. For licensing terms and - conditions see http://qt.digia.com/licensing. For further information + a written agreement between you and Digia. For licensing terms and + conditions see http://qt.digia.com/licensing. For further information use the contact form at http://qt.digia.com/contact-us. GNU Lesser General Public License Usage Alternatively, this file may be used under the terms of the GNU Lesser - General Public License version 2.1 as published by the Free Software - Foundation and appearing in the file LICENSE.LGPL included in the - packaging of this file. Please review the following information to - ensure the GNU Lesser General Public License version 2.1 requirements - will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. + General Public License version 2.1 or version 3 as published by the Free + Software Foundation and appearing in the file LICENSE.LGPLv21 and + LICENSE.LGPLv3 included in the packaging of this file. Please review the + following information to ensure the GNU Lesser General Public License + requirements will be met: https://www.gnu.org/licenses/lgpl.html and + http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. In addition, as a special exception, Digia gives you certain additional - rights. These rights are described in the Digia Qt LGPL Exception + rights. These rights are described in the Digia Qt LGPL Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this package. - GNU General Public License Usage - Alternatively, this file may be used under the terms of the GNU - General Public License version 3.0 as published by the Free Software - Foundation and appearing in the file LICENSE.GPL included in the - packaging of this file. Please review the following information to - ensure the GNU General Public License version 3.0 requirements will be - met: http://www.gnu.org/copyleft/gpl.html. - - $QT_END_LICENSE$ ****************************************************************************/
[-] [+]	Changed	qtimageformats-5.4.1.tar.xz/tests/benchmarks/tiff/tst_qtiff.cpp ^
@@ -1,40 +1,32 @@ /************************************************************************** - Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). + Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). Contact: http://www.qt-project.org/legal This file is part of the QtAddOn.ImageFormats module of the Qt Toolkit. - $QT_BEGIN_LICENSE:LGPL$ + $QT_BEGIN_LICENSE:LGPL21$ Commercial License Usage Licensees holding valid commercial Qt licenses may use this file in accordance with the commercial license agreement provided with the Software or, alternatively, in accordance with the terms contained in - a written agreement between you and Digia. For licensing terms and - conditions see http://qt.digia.com/licensing. For further information + a written agreement between you and Digia. For licensing terms and + conditions see http://qt.digia.com/licensing. For further information use the contact form at http://qt.digia.com/contact-us. GNU Lesser General Public License Usage Alternatively, this file may be used under the terms of the GNU Lesser - General Public License version 2.1 as published by the Free Software - Foundation and appearing in the file LICENSE.LGPL included in the - packaging of this file. Please review the following information to - ensure the GNU Lesser General Public License version 2.1 requirements - will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. + General Public License version 2.1 or version 3 as published by the Free + Software Foundation and appearing in the file LICENSE.LGPLv21 and + LICENSE.LGPLv3 included in the packaging of this file. Please review the + following information to ensure the GNU Lesser General Public License + requirements will be met: https://www.gnu.org/licenses/lgpl.html and + http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. In addition, as a special exception, Digia gives you certain additional - rights. These rights are described in the Digia Qt LGPL Exception + rights. These rights are described in the Digia Qt LGPL Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this package. - GNU General Public License Usage - Alternatively, this file may be used under the terms of the GNU - General Public License version 3.0 as published by the Free Software - Foundation and appearing in the file LICENSE.GPL included in the - packaging of this file. Please review the following information to - ensure the GNU General Public License version 3.0 requirements will be - met: http://www.gnu.org/copyleft/gpl.html. - - $QT_END_LICENSE$ ****************************************************************************/
[-] [+]	Changed	qtimageformats-5.4.1.tar.xz/tests/shared/images/dds.qrc ^
@@ -49,6 +49,6 @@ <file>dds/YUY2.dds</file> <file>dds/RXGB.dds</file> <file>dds/ATI2.dds</file> - <file>dds/A8R8G8B8_2.dds</file> + <file>dds/A8R8G8B8.2.dds</file> </qresource> </RCC>
[-] [+]	Changed	qtimageformats-5.4.1.tar.xz/tests/shared/images/dds/A8R8G8B8.2.dds ^
(renamed from tests/shared/images/dds/A8R8G8B8_2.dds)
[-] [+]	Changed	qtimageformats-5.4.1.tar.xz/tests/shared/images/icns.qrc ^
@@ -4,6 +4,7 @@ <file>icns/test-jp2.icns</file> <file>icns/test-32bit.icns</file> <file>icns/test-legacy.icns</file> + <file>icns/test-variants.icns</file> <file>icns/test-write-16.png</file> <file>icns/test-write-32.png</file> <file>icns/test-write-64.png</file>
	Added	qtimageformats-5.4.1.tar.xz/tests/shared/images/icns/test-variants.icns ^