From 15ba591a1b45138f6f5ae4fb6dbbc79129b4f353 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Sat, 31 Dec 2011 09:41:39 -0500 Subject: [PATCH] Happy New Year! --- CHANGES | 2 + COPYING | 478 ++-------------------------- IMG.c | 37 ++- IMG_bmp.c | 37 ++- IMG_gif.c | 37 ++- IMG_jpg.c | 37 ++- IMG_lbm.c | 37 ++- IMG_pcx.c | 31 +- IMG_png.c | 37 ++- IMG_pnm.c | 31 +- IMG_tga.c | 37 ++- IMG_tif.c | 37 ++- IMG_webp.c | 58 ++-- IMG_xcf.c | 37 ++- IMG_xpm.c | 37 ++- IMG_xv.c | 37 ++- IMG_xxx.c | 37 ++- Makefile.am | 6 +- SDL_image.h | 37 ++- VisualC/Version.rc | 2 +- VisualCE.zip | Bin 9547 -> 0 bytes VisualCE/SDL_image.dsp | 164 ++++++++++ VisualCE/SDL_image.dsw | 41 +++ VisualCE/SDL_image.sln | 30 ++ VisualCE/SDL_image.vcproj | 343 ++++++++++++++++++++ VisualCE/Version.rc | 106 ++++++ VisualCE/clean.sh | 5 + VisualCE/resource.h | 15 + VisualCE/showimage/showimage.dsp | 106 ++++++ VisualCE/showimage/showimage.sln | 20 ++ VisualCE/showimage/showimage.vcproj | 68 ++++ showimage.c | 37 ++- version.rc | 2 +- 33 files changed, 1225 insertions(+), 801 deletions(-) delete mode 100644 VisualCE.zip create mode 100644 VisualCE/SDL_image.dsp create mode 100644 VisualCE/SDL_image.dsw create mode 100644 VisualCE/SDL_image.sln create mode 100644 VisualCE/SDL_image.vcproj create mode 100644 VisualCE/Version.rc create mode 100644 VisualCE/clean.sh create mode 100644 VisualCE/resource.h create mode 100644 VisualCE/showimage/showimage.dsp create mode 100644 VisualCE/showimage/showimage.sln create mode 100644 VisualCE/showimage/showimage.vcproj diff --git a/CHANGES b/CHANGES index 9a66cef2..70743531 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,6 @@ 1.2.11: +Sam Lantinga - Sat Dec 31 09:35:40 EST 2011 + * SDL_image is now under the zlib license Michael Bonfils - Mon Nov 28 21:46:00 EST 2011 * Added WEBP image support Thomas Klausner - Wed Jan 19 19:31:25 PST 2011 diff --git a/COPYING b/COPYING index 2cba2ac7..4e93f208 100644 --- a/COPYING +++ b/COPYING @@ -1,458 +1,20 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 51 Franklin St, 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.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -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 Library, 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 Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you 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. - - If distribution of 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 satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be 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. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. 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 not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library 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. - - 9. 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 Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the 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 -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS +/* + SDL_image: An example image loading library for use with SDL + Copyright (C) 1997-2012 Sam Lantinga + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. +*/ diff --git a/IMG.c b/IMG.c index 5521f373..d40e8650 100644 --- a/IMG.c +++ b/IMG.c @@ -1,23 +1,22 @@ /* - SDL_image: An example image loading library for use with SDL - Copyright (C) 1997-2009 Sam Lantinga - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org + SDL_image: An example image loading library for use with SDL + Copyright (C) 1997-2012 Sam Lantinga + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. */ /* A simple library to load images of various formats as SDL surfaces */ diff --git a/IMG_bmp.c b/IMG_bmp.c index 9e5b0c89..b3c7580b 100644 --- a/IMG_bmp.c +++ b/IMG_bmp.c @@ -1,23 +1,22 @@ /* - SDL_image: An example image loading library for use with SDL - Copyright (C) 1997-2009 Sam Lantinga - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org + SDL_image: An example image loading library for use with SDL + Copyright (C) 1997-2012 Sam Lantinga + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. */ #if !defined(__APPLE__) || defined(SDL_IMAGE_USE_COMMON_BACKEND) diff --git a/IMG_gif.c b/IMG_gif.c index ba8258a7..feff9595 100644 --- a/IMG_gif.c +++ b/IMG_gif.c @@ -1,23 +1,22 @@ /* - SDL_image: An example image loading library for use with SDL - Copyright (C) 1997-2009 Sam Lantinga - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org + SDL_image: An example image loading library for use with SDL + Copyright (C) 1997-2012 Sam Lantinga + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. */ #if !defined(__APPLE__) || defined(SDL_IMAGE_USE_COMMON_BACKEND) diff --git a/IMG_jpg.c b/IMG_jpg.c index 2bca3a26..c979d84b 100644 --- a/IMG_jpg.c +++ b/IMG_jpg.c @@ -1,23 +1,22 @@ /* - SDL_image: An example image loading library for use with SDL - Copyright (C) 1997-2009 Sam Lantinga - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org + SDL_image: An example image loading library for use with SDL + Copyright (C) 1997-2012 Sam Lantinga + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. */ #if !defined(__APPLE__) || defined(SDL_IMAGE_USE_COMMON_BACKEND) diff --git a/IMG_lbm.c b/IMG_lbm.c index f3d66ab7..f475c60c 100644 --- a/IMG_lbm.c +++ b/IMG_lbm.c @@ -1,23 +1,22 @@ /* - SDL_image: An example image loading library for use with SDL - Copyright (C) 1997-2009 Sam Lantinga - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org + SDL_image: An example image loading library for use with SDL + Copyright (C) 1997-2012 Sam Lantinga + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. */ /* This is a ILBM image file loading framework diff --git a/IMG_pcx.c b/IMG_pcx.c index 80ce32e7..f62eac12 100644 --- a/IMG_pcx.c +++ b/IMG_pcx.c @@ -1,23 +1,22 @@ /* - SDL_image: An example image loading library for use with SDL - Copyright (C) 1997-2009 Sam Lantinga + SDL_image: An example image loading library for use with SDL + Copyright (C) 1997-2012 Sam Lantinga - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. */ /* diff --git a/IMG_png.c b/IMG_png.c index 99d5b571..b17558f3 100644 --- a/IMG_png.c +++ b/IMG_png.c @@ -1,23 +1,22 @@ /* - SDL_image: An example image loading library for use with SDL - Copyright (C) 1997-2009 Sam Lantinga - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org + SDL_image: An example image loading library for use with SDL + Copyright (C) 1997-2012 Sam Lantinga + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. */ #if !defined(__APPLE__) || defined(SDL_IMAGE_USE_COMMON_BACKEND) diff --git a/IMG_pnm.c b/IMG_pnm.c index 1d0fb96f..0787f52a 100644 --- a/IMG_pnm.c +++ b/IMG_pnm.c @@ -1,23 +1,22 @@ /* - SDL_image: An example image loading library for use with SDL - Copyright (C) 1997-2009 Sam Lantinga + SDL_image: An example image loading library for use with SDL + Copyright (C) 1997-2012 Sam Lantinga - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. */ /* diff --git a/IMG_tga.c b/IMG_tga.c index c298cdd4..0e65c5d3 100644 --- a/IMG_tga.c +++ b/IMG_tga.c @@ -1,23 +1,22 @@ /* - SDL_image: An example image loading library for use with SDL - Copyright (C) 1997-2009 Sam Lantinga - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org + SDL_image: An example image loading library for use with SDL + Copyright (C) 1997-2012 Sam Lantinga + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. */ #if !defined(__APPLE__) || defined(SDL_IMAGE_USE_COMMON_BACKEND) diff --git a/IMG_tif.c b/IMG_tif.c index 1c40de36..25084ad7 100644 --- a/IMG_tif.c +++ b/IMG_tif.c @@ -1,23 +1,22 @@ /* - SDL_image: An example image loading library for use with SDL - Copyright (C) 1997-2009 Sam Lantinga - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org + SDL_image: An example image loading library for use with SDL + Copyright (C) 1997-2012 Sam Lantinga + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. */ #if !defined(__APPLE__) || defined(SDL_IMAGE_USE_COMMON_BACKEND) diff --git a/IMG_webp.c b/IMG_webp.c index 9423eb98..b9bf461e 100644 --- a/IMG_webp.c +++ b/IMG_webp.c @@ -1,23 +1,22 @@ /* - SDL_image: An example image loading library for use with SDL - Copyright (C) 1997-2009 Sam Lantinga - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org + SDL_image: An example image loading library for use with SDL + Copyright (C) 1997-2012 Sam Lantinga + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. */ /* This is a WEBP image file loading framework */ @@ -35,27 +34,6 @@ Revision: Created by: Michael Bonfils (Murlock) (26 November 2011) murlock42@gmail.com - Modified by: - - Copyright notice: - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this library; if not, write to the Free - Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - - Comments: - - - Changes: =============================================================================*/ diff --git a/IMG_xcf.c b/IMG_xcf.c index e3389f9e..1dced65e 100644 --- a/IMG_xcf.c +++ b/IMG_xcf.c @@ -1,23 +1,22 @@ /* - SDL_image: An example image loading library for use with SDL - Copyright (C) 1997-2009 Sam Lantinga - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org + SDL_image: An example image loading library for use with SDL + Copyright (C) 1997-2012 Sam Lantinga + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. */ /* This is a XCF image file loading framework */ diff --git a/IMG_xpm.c b/IMG_xpm.c index 0a58c5be..9ad62760 100644 --- a/IMG_xpm.c +++ b/IMG_xpm.c @@ -1,23 +1,22 @@ /* - SDL_image: An example image loading library for use with SDL - Copyright (C) 1997-2009 Sam Lantinga - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org + SDL_image: An example image loading library for use with SDL + Copyright (C) 1997-2012 Sam Lantinga + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. */ /* diff --git a/IMG_xv.c b/IMG_xv.c index 02793084..0383ec9f 100644 --- a/IMG_xv.c +++ b/IMG_xv.c @@ -1,23 +1,22 @@ /* - SDL_image: An example image loading library for use with SDL - Copyright (C) 1997-2009 Sam Lantinga - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org + SDL_image: An example image loading library for use with SDL + Copyright (C) 1997-2012 Sam Lantinga + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. */ /* This is a XV thumbnail image file loading framework */ diff --git a/IMG_xxx.c b/IMG_xxx.c index 9e4a9d55..924dd38c 100644 --- a/IMG_xxx.c +++ b/IMG_xxx.c @@ -1,23 +1,22 @@ /* - SDL_image: An example image loading library for use with SDL - Copyright (C) 1997-2009 Sam Lantinga - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org + SDL_image: An example image loading library for use with SDL + Copyright (C) 1997-2012 Sam Lantinga + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. */ /* This is a generic "format not supported" image framework */ diff --git a/Makefile.am b/Makefile.am index 42a21aec..e1d4d280 100644 --- a/Makefile.am +++ b/Makefile.am @@ -28,9 +28,9 @@ EXTRA_DIST = \ CHANGES \ version.rc \ VisualC \ - VisualCE.zip \ - Xcode.tar.gz \ - Xcode_iPhone.tar.gz \ + VisualCE \ + Xcode \ + Xcode_iPhone \ MPWmake.sea.bin \ Watcom-OS2.zip \ IMG_xxx.c \ diff --git a/SDL_image.h b/SDL_image.h index faf9ed60..a34ad026 100644 --- a/SDL_image.h +++ b/SDL_image.h @@ -1,23 +1,22 @@ /* - SDL_image: An example image loading library for use with SDL - Copyright (C) 1997-2009 Sam Lantinga - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org + SDL_image: An example image loading library for use with SDL + Copyright (C) 1997-2012 Sam Lantinga + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. */ /* A simple library to load images of various formats as SDL surfaces */ diff --git a/VisualC/Version.rc b/VisualC/Version.rc index a3287962..ecb5d7aa 100755 --- a/VisualC/Version.rc +++ b/VisualC/Version.rc @@ -48,7 +48,7 @@ BEGIN VALUE "FileDescription", "SDL_image\0" VALUE "FileVersion", "1, 2, 11, 0\0" VALUE "InternalName", "SDL_image\0" - VALUE "LegalCopyright", "Copyright © 2009 Sam Lantinga\0" + VALUE "LegalCopyright", "Copyright © 2012 Sam Lantinga\0" VALUE "OriginalFilename", "SDL_image.dll\0" VALUE "ProductName", "Simple DirectMedia Layer\0" VALUE "ProductVersion", "1, 2, 11, 0\0" diff --git a/VisualCE.zip b/VisualCE.zip deleted file mode 100644 index 79e7bf9644591ead4113c36c896e6706241eb027..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9547 zcma)?1yo$w(zYA71ShyV3GQyewUNdG!Cis`cL?t8?(P;`f@{#=?oJ^1M`r#z!_4H) z{kzxc?z7fePgU=I&aT>TmAn)LBs}2f>;9c3_isP`-v=B34*)W;{itIuEJClW1P6c! zgL#yUemXunA^^Z3zk>k)kmyer%ReE0e!~Ka^sd-C&?SpNPiH4j2g-AVp1FaJC7rGD zZ>R{cTv4ZgqNE0gq<~|JW3+{D#FfQ?W5ZHIGRpD}5;8P0Dk@_#rQ$LmssZIOS{lWI zGUb5EEy=DTJ}Op9)=G}piZGT0MB0{#wMi2Fm%fwR(qO6eJBV2e-zi z*9sivtskQAdr^y3sFzJk>#*Nmd}Sh`;$1b=G}~t2a~JZroSrscIN=S;X4U_(s`GY= zKH6WApO(X?3h_m&4{z(*%Jx*xxDTj9uoY8As_vboTCYP)iC3efX%gDVfDgL=USK>) zM1+|Skxyg@AA1Mv(lk`8rdA!gJB?JeOT&tCEVGTpDx=KfdP$*^Q&)BS@$Ly(3-A3c zToSOj?E&h~sXeJYXJam}+w6w~0JfiI`_=Q2Q+zA^-o!%3$be4Y_QP-Ud+|2oSMz(Q zYGJh|iu^!8{iw6I@4sQ!0a=!BrbGkAHpvSClBVmYj;gK0tnRo}cb8aMcDRG4fDHSh zTr5dRJ}`1HR6RQ4m>znMC^`i1)NRBlei7KjlR>;=t;>w4-bYx7(dF5QPNyx+^9{vL zf;B-5k0wKkbQ;{B!RgXu_WE%BIG^$ukrZQCHHAFmw6vTflPhPAmKl9y%fw~Nj=8h*eA@^R-)X|fOePO78fIbC zGDu^(tftA39A?WZoJ1-L1 zv*IM)#UsMg+C870n6oIy_O1+q7h`L(ho ziVEo|Px6kLdan(xU10ck<05+=L(J*grDIe!hz~oF>yrAT$u}r85L(}*< z9R-+cJV6m_R{{l6{`FmWj01c>O^JaNkx#zB0>d<{9sk7WRx6^-cu9$7!tViE}N)p&%*AI#SfeAa7 z^e;r!dvIucg1+a+3CH*mFNS|6&0TgvCV<#uF`scO@GWiu_DtM3D4V_W63PbOWMV!^ z9h??9C(mFj1DEw*EK+8m4Yg=b7&gQ_jCXWU$2dMRv&=EKw3~}iVs&s;jMdUPtRXdH zCTNq9E1J4|bxPB|sUc&I>VNw33vWJUnY4$CVI4!79kOQg10S0Q)VS7myx{G&i*wuJ zUP5H7mUE+$(ueA~s99&j`9hj?dRQ-q9$iZQbRVdfZhLhaFBim}W&C=^D%BV}X+^-c zEe%(`>wT7G6h5FtjnNrTX(C5-*fo3`)!-|akot0ZGX#}cU4-#_*$0edelbm zrEZU$bR1h^VYc1DV{%nUy{>hVkbIzzjeWcg&=0UA~KZ=ds(PHD@=k_n!X_V zs6s9EqPM*;`Y1^&^`c#UTJp*)66sETL(hLwvV5i?SDBu-p!RB0vGibb{+pJoubJ;{ zl%k6L5K_twKUF14{!!twD^C)kFa@im&S2?xv6!}JA*Hufl}gj+GIseXq#S_%%fjgJ z+rmh}TF3E=s4^TbDAgr^{OQ>1&flo{n|wu!uPD_~9<&~6ls27r$!?L^SJ~OnOXRa< z84UG{jZCO*mSvu$lcm%m7HntBjt&2k!blva+g2stsEYxXtSDF|T6*LNt>9Nz3b-P; z(u=3FbtAx$YK{<00#$Dg>UK3%qW*TrZiKKkiXkAyoJHD5Ij1+nno%7qRygguwoil9D5IO_fzy;h5fI?WovHv+i=k> zUrRXuGfx;+9+d4AK-c`5^T<$$D{ah7`)TY`@Gb$UP7)SI5>oqj!ccRe=6^zEHL9a9V zJ0p9|K49fa2z$w+)3Gt&__6|bd=KD|)~YV18ECs~hWr*7K9Us|z1;LGEn@P8RrecE z`Dj6*>HV6h(SAQNq?tI5CQ%>}k;1i}iraJ^Ca%EC_j~HJQ{>h5IN}T%svK zm%g*Dc!<8w(mG(mhcP8UqsFi=PS6&@_D%h)wecQc_(r*QbIz>x!-E<>+jzkyy-a-66ZC4+HBD zA$nW8yD^75a+yBvj9u65=_?Erjx+l%!gmI)qpm}*lL|JuxZ&ckfyk|3f4wK9QosTd zU;uzPGXMbl*SUqg-Uk~i(?4#D@bjL(XQGFiW>(+C(eGO)9$*HGKu_rbxI`0mCdRB^ z6#}H7P*t&b-z-E!CGXN{LX_LxRSPrQC?vyS9iv?i6?V8$*>S4NQ6d^HW&AN^7;PxZ zDeb|l&1gGNT!fkSR~vtk>uDRAyMDRUjS-u(TL=D!4|BD50`=T1473X*KS-Gh(C?ew zFXVxUFyaIIGgXtRN%!QbP@iQMy}_>nHO<~&3J5|K7@=2~1dwYZC4_0$GRunB1+C)?cyMJLp_UJuLI zO)irl)FuWF4pkw<&tT1CB;ev3g2FHk5KD9f?BF|wnzi;q-vNRASP#{7p2eQdV9K=M zufzKFfbJhzKKjb=w|ac6(T{N$P#De);OMKd3$jmZp2S=u?UfEguB2ijek35dsALuj zxEV55DQx7MvcRSLxS&kpSzw$2!}k5ys+o9PMu~WKmu7qJV)m-tmtKmUuL*~RMiK~} z5?i+aaKkITgq^DKB8PIB)fSro0>Qve3pnlrpRV{m5fEmyMd9R z=r%4TIM*P2KIilH&!U=Bg<2wX-aYO5=Q|pc$3#qZFCY;ZoI*H@fr|U9umOPS9)Z?y zxDxyls9ss%QK9;E9*tBej5ze0KyQ2`o3Hg90CKQNdCC(Wa5QcuN|uv>CWM)^v=<1{ zw!N=9${>m%YN1*pW{jPLRVJ?R0u$9t@(LH@bCF;b#IUNmba3NpNAP^SfZg99vB3~B z@fgf8H`xJ3;Z-ke^*^bx%Mj#Q&b;eF9Ku$og^Yx-Y>qVeaRqX$I{BIomiNi-hM={5 z+{9zHs`u-w~I!Z?Q$J$Hl)x1K}!?Y}n4353r{Q>3AnWnMoiu-t&+8ikf zqsrx$+ze%tAU-9@P(9$HNNQdFaQ&;r!0V z32YYJTrYa3216^x6^^n*tGUcdk}67Dw-M!R3J=hPOAYmRn$&}E6!SAqLx@dZLKohl zaXXaujcC@l^EB)l^VVw7-vP^G)gU7J;Z^GA0Yp?q)F&AMyUhWddqjewu&B0(C63KC z0O?UIFdJ7wPI-tN%WL$@7A`gt)t)M7)dS|ZZyjK*-@(Z6Md1w=#mEbzLu;O_0Nq+E zS!9!I8f>q$K|BK)+nop{zk?MsYvS3Wuk8)EXg(zE!s7K^gwFI;2qpyF%#QAc-KjNv zGV4PPMr{Zq676XkzM2kYNbpBio2>_=X?iJd$`hg)+4FK^QaDy+Te3rza)aU zAws8wj}zOxG(h%+#Mk@mEysj0?4E-iHaX)4el{UU>+F4ix^Ck<3AR!}2TYBV{2cq1 z58IYIin$#7PODW(o47%iwpB24Cq<6ojwQiVC*LAbX-1j(-Ok&5G9qdpi#7DBNbil> zNS}BXs(l=A15#AzdJ>2RKdne?o+BOcm$nk=YLbWcfh|5;m_-@|M-U2&mF$WIfoQ}N zpTsdqGy^Uk6?6QXtEyiu>y2yTHX)1GVAC`3EjMD625#s3zQshn{~W(#p-bQ^s12_cbAzbRr@D9?lcs{hl$t16AYql7A#T>2X-N8FdlUN~uPO0Knf z50$4U09TFs$(G60oGtnSIW`1cux>TI$%);7c#Tq^4DLB_ydjm}p;cQux$oN>XEyoc zHJoY#r#0g{sjSf(PFu!-vKa>+ptDP~3efpBB@6rVtkIVfKb_uh zTHvII*b{gnvL-A=_r7~jY;7S-&X%wxGow+sfLPGBAC}gAcg{^LW@%|dIcAA3Uz{og zGn;cX0XB)-7YCIkK4i?EidQAz_P)QEs--*MIDP_c&E4aSMw0%NI_SN#T|w}~d~$Qp z#QZio`PJ1P{tqFZUG5hQ@U7ym#{TV?Xu>Bwg1_76hHX9RF7@;QWUmBw``aVCGQP62 zhE+wki~KQ$=uJnlc75~Pl}tjxK0o#BO|(Ay?nH!BBsyF{lge$$p)q@SVwcacfp zjnH32roRXh8Da1c+L#2z95K=eFs_!IWWuRqj@ zg5n{rUu2b=Do^SJ2l9hf;iC?n3*omZg3OBgZ>4mUU~sUsRwQ;Vyrt-zfne{WIjW+C z9`D1@z%!fQxJAn5M;BD|GLP~Qgr_Gtj2We^M9HBs>_WVBl!ls>*keW{?Rd=80=IZ2 z|KlYzS&kpYwrhtFQ#MYLX!qw{;un}G7+(kpA9?s)99~okkB5^@`Wp^_^9w%!Ea-%y z+SzHy)=}=X3PBhnw^!PTIt(eE2KJO3y!?t=5_$`X3!!huEY+0CJ9?hP2`S@l>vome1iD_)R8{t*jbsV9ot zeSMNEWnwg%X(VaXSbPNAPN#0=3aslAJtf7Zacz5qZ71S&o0(YOyXh_ zY9bKW9oO>VbWlZuXO=g*vuWE@$xZJwOf)VDuEZHg z`gt^rLq+{Cm3E@i(!W#klIlO0vejw$ot!b|9oB)>yr-`?i^swGQW>=|ROLJDXVDRw zBipvV>{=!uVH{(^&?J7& zT0!hOMIe_uxFJKL z=X-)g@-MPbyaIs_s`ubcZDI5&h~?~upccc13B`$&dS^Ix4cdTGmAcTDqm|b}8Ci?R z-P>j#3IG1|k0(I#?U5TS0(uJrHPNXWhpd7*>(CcmwBI{L(Z5FBzjsonYQ4~XbotVn*HmaYT6(Y2>B&H`j*j?_}k7m#J zD@M1rwj1y}zGAVs92%cLIn_`SMUfiCB93=w@JXmD%8Q5RYQ){P5a8m-Y^f%idxp=S zOzC0|M(cWI)wrD((vC=I7MMta+OEE*C1tFfa_lHCI|3iRhpuI+pv0eEN;uE|Y+r9) zm%v3Gs7ayzv{AK%`2Sd3{qPZ|cJt#wtu6xLf;g#jV#;i)N#nj z)v8w!4ToKi7HrMDBctH@3^EeIuj|@ORXO!PUhbVeRKqvu2nwoJd|ZvAbh#%&%OfE< zrlX+5J)mv6d?r%=oUZN`< zZUlQIa^i+5T*wSss48JTN2?G8p@9%4M9%!I-4VI1FWY%NN3hlP;W~esH=6pT7|lyn zSJJiR4wbm;7ELnk=!JG0K3Ae?x7EuM1>rUo79j}E(D$luDFuQ;;~jWsC_L=BQ>&9~ z*9cPG&F#X%xGD3+wk`7A?3OsVdHIf0SWSnImb;sBb-{~XkIhNFNsDLP8+Jad5oC}U zG+p#n3e`jDKd?Xak^o0AV+&9oE-g;pDxK#*{QL&eR%5ZrL6^@kT1ozsS3C+^S`q`D zbrlMu|EsB z+thG~gk^+s3z5SteN7vjG0G#@vnEU8!G`@+9-I+?wIIF8MOCBt3OW`0L#_&Z!~0~e zLM7`MwRl{2+zZX39r6zX47xzed%zNGcgVFTUH^Jk3}gnU;5`J&;sW%(~< z!g`>G7Qf;*?^56r&Gttg1+v9ffEyT`2|&&8=|E@7B*7H)+kbCJgHnTEJm{q8CBGNq z1fjkV{8D(LgLdYYY_CCR&H)o{MRRdl&YFDNlAX@CK5E6`^sOYo9R*U22d60lfFuu% zrF{}PU+z0peZrmMq~1#)(D$-Ld!w`+k;-*g!VJSd<%P`tQq7v@%$6(TA?DO|Q=sJmnyxUv?{@!J>YLT1zSdnFc zMq&~oF=S5pTe(n?z$`jicjLX=iOJ&QoWeY?hu6v$I|T67T6T&@`(mk1LXA$syaf#^ z^FiDS;63}$5C+HVE>QJd)FjH?L*26BIkhq_(riWT&%P$EvxZ^5RzbXk_LkNO=Wt20iMzOP5GlBgr&#v0OzWXS&As!aH7COTt%M0Ou(36a#J5PnGc>L%3QKp?BV-iFwWMg|S}!{)VS^;~=0 zv1nYdK#MpUrpxN+D_>w6T>z=t+NOF$Pf+_CDdT1e1m`J6kAwm8%|L0fnJd|PU|mR$ z@F3p|N|Hikb;$AM@E4Yld}BOkFG80GB2Sy_rR0}bj##m%J2gX~USn(p9vm21eYvG^ zs&;^eB}YxC218nt?VV(r&rPHTdlWQ&ZoY|Z_y+V6vl0zB`60I7cvr5z4Zo0r;n7vp zy+TgA+lF)NWZzV;mm7k*D(n|bh&YAtQRdRgmZT}^&@^kk3wK;~8C&Cm>B&wM@Zk}V zS!cRiRhBwJjXzhBVIDZQ-IZ75OZmJ^AHBLLqcu|LIR=Ae6R$aN30ACpWCHqv6|zO6 za}!u;OtRYQ@73DD2AM=t&=1}wSnSAA7}}i({REtw6cMl#>qQ~g)(7@cdHJ5Ck>ts0 zz|BF>evEe)WGaSm5(9}azv3y}9ReBg@|;CceAS#H2_GN2K|vr9kDSCD&qpjPeY}48 z;loSdaNRqbH9GtCcZfeaFvrjHJ7{f2Sodo`>+m0^`XF?j3eDqig9u4EuoAz8){|G3 z4BnC4eD@pgyOX$y!VI}2B5;(b06BcS&-$wP1EOkK!A1YWjq{H!0ww(I$Lh`WJ7T-= zN8}Of!_7Vxo?|zjW1n{`Jb{09EBp)ipXK}KV1lQ$V?ic+Pfyx^I5L{!hmEZ}|Tvb^MP1{f;wuN>Bg5|DjMk2_H}3pTft#`2A1WC%+h^Kdn5Q tjsIcjpJDU4p?v&jhMot}r*Zm40F{@5f_{1y0WY53YEOHO1)`s4{|6euWE}ti diff --git a/VisualCE/SDL_image.dsp b/VisualCE/SDL_image.dsp new file mode 100644 index 00000000..b5a5953e --- /dev/null +++ b/VisualCE/SDL_image.dsp @@ -0,0 +1,164 @@ +# Microsoft Developer Studio Project File - Name="SDL_image" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 5.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 + +CFG=SDL_image - Win32 Release +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "SDL_image.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "SDL_image.mak" CFG="SDL_image - Win32 Release" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "SDL_image - Win32 Release" (based on\ + "Win32 (x86) Dynamic-Link Library") +!MESSAGE "SDL_image - Win32 Debug" (based on\ + "Win32 (x86) Dynamic-Link Library") +!MESSAGE + +# Begin Project +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +MTL=midl.exe +RSC=rc.exe + +!IF "$(CFG)" == "SDL_image - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "graphics\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "LOAD_BMP" /D "LOAD_GIF" /D "LOAD_JPG" /D LOAD_JPG_DYNAMIC=\"jpeg.dll\" /D "LOAD_LBM" /D "LOAD_PCX" /D "LOAD_PNG" /D LOAD_PNG_DYNAMIC=\"libpng12-0.dll\" /D "LOAD_PNM" /D "LOAD_TGA" /D "LOAD_TIF" /D LOAD_TIF_DYNAMIC=\"libtiff-3.dll\" /D "LOAD_XPM" /D "LOAD_XV" /D "PNG_USE_DLL" /D "ZLIB_DLL" /YX /FD /c +# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 +# ADD BASE RSC /l 0x409 /d "NDEBUG" +# ADD RSC /l 0x409 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /machine:I386 +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib SDL.lib /nologo /subsystem:windows /dll /machine:I386 + +!ELSEIF "$(CFG)" == "SDL_image - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c +# ADD CPP /nologo /MD /W3 /Gm /GX /Zi /Od /I "graphics\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "LOAD_BMP" /D "LOAD_GIF" /D "LOAD_JPG" /D LOAD_JPG_DYNAMIC=\"jpeg.dll\" /D "LOAD_LBM" /D "LOAD_PCX" /D "LOAD_PNG" /D LOAD_PNG_DYNAMIC=\"libpng12-0.dll\" /D "LOAD_PNM" /D "LOAD_TGA" /D "LOAD_TIF" /D LOAD_TIF_DYNAMIC=\"libtiff-3.dll\" /D "LOAD_XPM" /D "LOAD_XV" /D "PNG_USE_DLL" /D "ZLIB_DLL" /YX /FD /c +# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib SDL.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept + +!ENDIF + +# Begin Target + +# Name "SDL_image - Win32 Release" +# Name "SDL_image - Win32 Debug" +# Begin Group "SDL_image Sources" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\IMG.c +# End Source File +# Begin Source File + +SOURCE=..\IMG_bmp.c +# End Source File +# Begin Source File + +SOURCE=..\IMG_gif.c +# End Source File +# Begin Source File + +SOURCE=..\IMG_jpg.c +# End Source File +# Begin Source File + +SOURCE=..\IMG_lbm.c +# End Source File +# Begin Source File + +SOURCE=..\IMG_pcx.c +# End Source File +# Begin Source File + +SOURCE=..\IMG_png.c +# End Source File +# Begin Source File + +SOURCE=..\IMG_pnm.c +# End Source File +# Begin Source File + +SOURCE=..\IMG_tga.c +# End Source File +# Begin Source File + +SOURCE=..\IMG_tif.c +# End Source File +# Begin Source File + +SOURCE=..\IMG_xcf.c +# End Source File +# Begin Source File + +SOURCE=..\IMG_xpm.c +# End Source File +# Begin Source File + +SOURCE=..\IMG_xv.c +# End Source File +# Begin Source File + +SOURCE=..\IMG_xxx.c +# End Source File +# Begin Source File + +SOURCE=Version.rc +# End Source File +# End Group +# Begin Group "SDL_image Headers" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\SDL_image.h +# End Source File +# End Group +# End Target +# End Project diff --git a/VisualCE/SDL_image.dsw b/VisualCE/SDL_image.dsw new file mode 100644 index 00000000..28d1f435 --- /dev/null +++ b/VisualCE/SDL_image.dsw @@ -0,0 +1,41 @@ +Microsoft Developer Studio Workspace File, Format Version 5.00 +# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! + +############################################################################### + +Project: "SDL_image"=".\SDL_image.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "showimage"=".\showimage\showimage.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Global: + +Package=<5> +{{{ +}}} + +Package=<3> +{{{ +}}} + +############################################################################### + diff --git a/VisualCE/SDL_image.sln b/VisualCE/SDL_image.sln new file mode 100644 index 00000000..10a12fb2 --- /dev/null +++ b/VisualCE/SDL_image.sln @@ -0,0 +1,30 @@ + +Microsoft Visual Studio Solution File, Format Version 9.00 +# Visual Studio 2005 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL_image", "SDL_image.vcproj", "{2BD5534E-00E2-4BEA-AC96-D9A92EA24696}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Pocket PC 2003 (ARMV4) = Debug|Pocket PC 2003 (ARMV4) + Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) + Release|Pocket PC 2003 (ARMV4) = Release|Pocket PC 2003 (ARMV4) + Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {2BD5534E-00E2-4BEA-AC96-D9A92EA24696}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Pocket PC 2003 (ARMV4) + {2BD5534E-00E2-4BEA-AC96-D9A92EA24696}.Debug|Pocket PC 2003 (ARMV4).Build.0 = Debug|Pocket PC 2003 (ARMV4) + {2BD5534E-00E2-4BEA-AC96-D9A92EA24696}.Debug|Pocket PC 2003 (ARMV4).Deploy.0 = Debug|Pocket PC 2003 (ARMV4) + {2BD5534E-00E2-4BEA-AC96-D9A92EA24696}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) + {2BD5534E-00E2-4BEA-AC96-D9A92EA24696}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) + {2BD5534E-00E2-4BEA-AC96-D9A92EA24696}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Deploy.0 = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) + {2BD5534E-00E2-4BEA-AC96-D9A92EA24696}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Pocket PC 2003 (ARMV4) + {2BD5534E-00E2-4BEA-AC96-D9A92EA24696}.Release|Pocket PC 2003 (ARMV4).Build.0 = Release|Pocket PC 2003 (ARMV4) + {2BD5534E-00E2-4BEA-AC96-D9A92EA24696}.Release|Pocket PC 2003 (ARMV4).Deploy.0 = Release|Pocket PC 2003 (ARMV4) + {2BD5534E-00E2-4BEA-AC96-D9A92EA24696}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) + {2BD5534E-00E2-4BEA-AC96-D9A92EA24696}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Deploy.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal + diff --git a/VisualCE/SDL_image.vcproj b/VisualCE/SDL_image.vcproj new file mode 100644 index 00000000..30e8be65 --- /dev/null +++ b/VisualCE/SDL_image.vcproj @@ -0,0 +1,343 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/VisualCE/Version.rc b/VisualCE/Version.rc new file mode 100644 index 00000000..b1058a21 --- /dev/null +++ b/VisualCE/Version.rc @@ -0,0 +1,106 @@ +//Microsoft Developer Studio generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "windows.h" +#include "resdefce.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (U.S.) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(1252) +#endif //_WIN32 + +#ifndef _MAC +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +VS_VERSION_INFO VERSIONINFO + FILEVERSION 1,2,11,0 + PRODUCTVERSION 1,2,11,0 + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x40004L + FILETYPE 0x2L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "CompanyName", "\0" + VALUE "FileDescription", "SDL_image\0" + VALUE "FileVersion", "1, 2, 11, 0\0" + VALUE "InternalName", "SDL_image\0" + VALUE "LegalCopyright", "Copyright © 2012 Sam Lantinga\0" + VALUE "OriginalFilename", "SDL_image.dll\0" + VALUE "ProductName", "Simple DirectMedia Layer\0" + VALUE "ProductVersion", "1, 2, 11, 0\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END + +#endif // !_MAC + + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE DISCARDABLE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE DISCARDABLE +BEGIN + "#include ""afxres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE DISCARDABLE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + +#endif // English (U.S.) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + diff --git a/VisualCE/clean.sh b/VisualCE/clean.sh new file mode 100644 index 00000000..f90a11e9 --- /dev/null +++ b/VisualCE/clean.sh @@ -0,0 +1,5 @@ +find . -type d -name 'Debug' -exec rm -rv {} \; +find . -type d -name 'Release' -exec rm -rv {} \; +find . -type f -name '*.user' -exec rm -v {} \; +find . -type f -name '*.ncb' -exec rm -v {} \; +find . -type f -name '*.suo' -exec rm -v {} \; diff --git a/VisualCE/resource.h b/VisualCE/resource.h new file mode 100644 index 00000000..ddc9d929 --- /dev/null +++ b/VisualCE/resource.h @@ -0,0 +1,15 @@ +//{{NO_DEPENDENCIES}} +// Microsoft Developer Studio generated include file. +// Used by Version.rc +// + +// Next default values for new objects +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS +#define _APS_NEXT_RESOURCE_VALUE 101 +#define _APS_NEXT_COMMAND_VALUE 40001 +#define _APS_NEXT_CONTROL_VALUE 1000 +#define _APS_NEXT_SYMED_VALUE 101 +#endif +#endif diff --git a/VisualCE/showimage/showimage.dsp b/VisualCE/showimage/showimage.dsp new file mode 100644 index 00000000..0a54a0df --- /dev/null +++ b/VisualCE/showimage/showimage.dsp @@ -0,0 +1,106 @@ +# Microsoft Developer Studio Project File - Name="showimage" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 5.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Application" 0x0101 + +CFG=showimage - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "showimage.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "showimage.mak" CFG="showimage - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "showimage - Win32 Release" (based on "Win32 (x86) Application") +!MESSAGE "showimage - Win32 Debug" (based on "Win32 (x86) Application") +!MESSAGE + +# Begin Project +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +MTL=midl.exe +RSC=rc.exe + +!IF "$(CFG)" == "showimage - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c +# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 +# ADD BASE RSC /l 0x409 /d "NDEBUG" +# ADD RSC /l 0x409 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib SDL.lib SDLmain.lib /nologo /subsystem:windows /machine:I386 + +!ELSEIF "$(CFG)" == "showimage - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c +# ADD CPP /nologo /MD /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c +# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib SDL.lib SDLmain.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept + +!ENDIF + +# Begin Target + +# Name "showimage - Win32 Release" +# Name "showimage - Win32 Debug" +# Begin Group "Showimage Sources" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\showimage.c +# End Source File +# End Group +# Begin Group "External Libraries" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\Release\SDL_image.lib +# End Source File +# End Group +# End Target +# End Project diff --git a/VisualCE/showimage/showimage.sln b/VisualCE/showimage/showimage.sln new file mode 100644 index 00000000..b3d41d8d --- /dev/null +++ b/VisualCE/showimage/showimage.sln @@ -0,0 +1,20 @@ + +Microsoft Visual Studio Solution File, Format Version 10.00 +# Visual Studio 2008 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "showimage", "showimage.vcproj", "{FEE80C5D-762E-4E57-9BCB-928749E8203F}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {FEE80C5D-762E-4E57-9BCB-928749E8203F}.Debug|Win32.ActiveCfg = Debug|Win32 + {FEE80C5D-762E-4E57-9BCB-928749E8203F}.Debug|Win32.Build.0 = Debug|Win32 + {FEE80C5D-762E-4E57-9BCB-928749E8203F}.Release|Win32.ActiveCfg = Release|Win32 + {FEE80C5D-762E-4E57-9BCB-928749E8203F}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/VisualCE/showimage/showimage.vcproj b/VisualCE/showimage/showimage.vcproj new file mode 100644 index 00000000..0e6d8ffc --- /dev/null +++ b/VisualCE/showimage/showimage.vcproj @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/showimage.c b/showimage.c index b33fdb90..6f29d7d5 100644 --- a/showimage.c +++ b/showimage.c @@ -1,23 +1,22 @@ /* - showimage: A test application for the SDL image loading library. - Copyright (C) 1997-2009 Sam Lantinga - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org + showimage: A test application for the SDL image loading library. + Copyright (C) 1997-2012 Sam Lantinga + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. */ #include diff --git a/version.rc b/version.rc index b9567618..198ab27f 100644 --- a/version.rc +++ b/version.rc @@ -25,7 +25,7 @@ BEGIN VALUE "FileDescription", "SDL_image\0" VALUE "FileVersion", "1, 2, 11, 0\0" VALUE "InternalName", "SDL_image\0" - VALUE "LegalCopyright", "Copyright © 2009 Sam Lantinga\0" + VALUE "LegalCopyright", "Copyright © 2012 Sam Lantinga\0" VALUE "OriginalFilename", "SDL_image.dll\0" VALUE "ProductName", "Simple DirectMedia Layer\0" VALUE "ProductVersion", "1, 2, 11, 0\0"