diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 8134462..0000000 --- a/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -*.exe -*.dll -*.zip -*.png -*.tim -*.bmp -obj \ No newline at end of file diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 9cecc1d..0000000 --- a/LICENSE +++ /dev/null @@ -1,674 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - 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; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If 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 convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU 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 -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "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 PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM 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 PROGRAM (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 PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - {one line to give the program's name and a brief idea of what it does.} - Copyright (C) {year} {name of author} - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program 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 General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - {project} Copyright (C) {year} {fullname} - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. diff --git a/README.md b/README.md deleted file mode 100644 index 6e04fca..0000000 --- a/README.md +++ /dev/null @@ -1,17 +0,0 @@ -# IMG2TIM -An Image to PlayStation TIM File Converter - -This tool converts almost any image file into a PlayStation TIM image file for PlayStation homebrew development. Uses the FreeImage library for loading image files of almost any file format. - -## Features -* Uses the same arguments used in bmp2tim with special additional arguments. -* Supports alpha channel (if available) with threshold control as transparency mask. -* Color-key and index-key transparency masking. -* Basic RGB to color-index image conversion. - -## Changelog -**Version 0.75** -* Fixed a pixel order bug when converting images from either RGB or 4-bit depth to 4-bit color depth. - -**Version 0.60** -* Initial release. \ No newline at end of file diff --git a/img2tim.cbp b/img2tim.cbp deleted file mode 100644 index 8a03427..0000000 --- a/img2tim.cbp +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - diff --git a/img2tim.depend b/img2tim.depend deleted file mode 100644 index a06bb54..0000000 --- a/img2tim.depend +++ /dev/null @@ -1,51 +0,0 @@ -# depslib dependency file v1.0 -1476085104 source:c:\documents and settings\lameguy64\desktop\projects\img2tim\main.cpp - - - - - - - - "tim.h" - -1395229970 c:\documents and settings\lameguy64\desktop\projects\img2tim\freeimage\freeimage.h - - - -1425871288 c:\documents and settings\lameguy64\desktop\projects\img2tim\libtim\libtim.cpp - -1430448034 c:\documents and settings\lameguy64\desktop\projects\img2tim\tim.cpp - -1476152828 source:c:\users\lameguy64\desktop\projects\img2tim\main.cpp - - - - - - - - "tim.h" - -1395229970 c:\users\lameguy64\desktop\projects\img2tim\freeimage\freeimage.h - - - -1446696616 c:\users\lameguy64\desktop\projects\img2tim\tim.cpp - -1458995574 c:\users\lameguy64\desktop\projects\img2tim\tim.h - - - - -1458995574 source:c:\users\lameguy64\desktop\projects\img2tim\tim.cpp - "tim.h" - -1459049574 source:c:\documents and settings\lameguy64\desktop\projects\img2tim\tim.cpp - "tim.h" - -1459049574 c:\documents and settings\lameguy64\desktop\projects\img2tim\tim.h - - - - diff --git a/img2tim.layout b/img2tim.layout deleted file mode 100644 index 3f2985d..0000000 --- a/img2tim.layout +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/img2tim.txt b/img2tim.txt deleted file mode 100644 index 58f3a3f..0000000 --- a/img2tim.txt +++ /dev/null @@ -1,69 +0,0 @@ -img2tim by Lameguy64 of Meido-Tek Productions - - -This tool converts almost any image file supported by FreeImage into a PlayStation standard TIM -texture image file. Made to replace the bmp2tim tool that came with the PsyQ SDK with additional -features not present in the original program. - -The program itself is still a work in progress but its complete enough as a usable tool. -Alpha-blending options and better color-index conversion have yet to be implemented. - - -Option Details: - --b - Set semi-transparent bit on fully black pixels (ignored when -usealpha is specified). - - If the semi-transparent bit on fully black pixels (R0 G0 B0) is set, the pixel will - be drawn opaque instead of transparent as fully black is treated by the PlayStation - as the transparent color by default. - --t - Set semi-transparent bit on non fully black pixels. - - This basically enables the output image to be drawn as semi-transparent since - semi-transparency is only applied to pixels with the semi-transparency bit set. - If the bit is not set, the pixel is always drawn opaque unless its a fully - black pixel. - --org < x y > - Specifies the VRAM offset of the image. - - Keep in mind that the width of the converted tim image may vary from the original - image's resolution depending on its color depth. 16-bit has no difference, 8-bit is - 1/2 of the original and 4-bit is about 1/4 of the original. No offset checking is - done so its recommended to check the resulting tim file with timtool. - --plt < x y > - Specifies the VRAM offset of the CLUT. - - CLUTs are usually 256x1 for 8-bit tims or 16x1 for 4-bit tims. No offset checking is - done so its recommended to check the resulting tim file with timtool. - --o < outFile > - Sets the name of the output file. - --usealpha - Use the alpha channel (if available) as a transparency mask. - - Most useful when working with png image files that have an alpha channel and tools - that utilize it, the alpha channel is used as a transparency mask when converting an - image with an alpha channel. - --alpt < value > - Specifies the threshold value when using the alpha channel as a transparency mask. - - If the alpha value of the pixel is less than the threshold (default: 127), the pixel - will be converted as transparent (pixel color replaced to fully black) and opaque if - above the threshold (pixel color intact). - --tindex < col > - Specify color index to be treated as transparent. - - This option only applies to images that are 4-bit/8-bit palletized. Any pixel that has - the same color-index specified will be made transparent. - --tcol < r g b > - Specify RGB color value to be transparent. - - Applies to both non-color index and color index images. Any pixel with a matching color - specified will be made transparent (replaced to fully black). - --bpp < bpp > - Specify the color depth for the output TIM file. - - Currently, a simple color-search algorithm is used when converting images from non-indexed - color depths (24-bit/16-bit) to 8-bit or 4-bit and will fail if more than 256 colors are - found. - - Supported output color depths: 4, 8, 16, 24 \ No newline at end of file diff --git a/img2tim_(v0.60).zip b/img2tim_(v0.60).zip new file mode 100644 index 0000000..a1132f3 Binary files /dev/null and b/img2tim_(v0.60).zip differ diff --git a/img2tim_(v0.75).zip b/img2tim_(v0.75).zip new file mode 100644 index 0000000..2418120 Binary files /dev/null and b/img2tim_(v0.75).zip differ diff --git a/main.cpp b/main.cpp deleted file mode 100644 index 108448b..0000000 --- a/main.cpp +++ /dev/null @@ -1,863 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include - -#include "tim.h" - -#define VERSION "0.75" - -namespace param { - - char InputFile[MAX_PATH] = { 0 }; - char OutputFile[MAX_PATH] = { 0 }; - - int BlackTrans = false; // Make black pixels transparent (STP bit off) - int ColorTrans = false; // Make non-black pixels translucent (STP bit on) - int UseAlphaMask = false; // Use alpha channel as transparency mask - int AlphaThresh = 127; // Alpha mask threshold - - int TransColR = -1; - int TransColG = -1; - int TransColB = -1; - - int TransCol = -1; - int OutputBpp = -1; - - tim::PARAM tim = { 0 }; - -} - - -typedef struct { - - int fmt; // 0 - 32-bit RGBA, 1 - 8-bit palletized, 2 - 4-bit palletized - short w,h; - void *pixels; - - short numCols; - void *colors; - -} IMGPARAM; - - -void ConvertImageToTim(IMGPARAM image, tim::PARAM* tim); -int SimpleQuantize(tim::PARAM* tim, int bitDepth); - - -int LoadImagePixels(const char* fileName, IMGPARAM* image, bool makeRGBA); -void FreeImageStruct(IMGPARAM* image); - - -int main(int argc, char *argv[]) { - - FreeImage_Initialise(false); - - printf("img2tim v%s - Converts most image files into PlayStation TIM files\n", VERSION); - printf("2016 Meido-Tek Productions (Lameguy64/TheCodingBrony)\n"); - printf("Powered by FreeImage v%s\n\n", FreeImage_GetVersion()); - - // Print banner if no arguments were passed - if (argc <= 1) { - - printf("Syntax:\n"); - printf(" img2tim [options] [-o ] \n\n"); - printf("Options:\n"); - printf(" -b - Sets semi-transparent bit on fully black pixels\n"); - printf(" (ignored when -usealpha is specified).\n"); - printf(" -t - Set semi-transparent bit on non fully black pixels.\n"); - printf(" -org - Specifies the VRAM offset of the image (Default: 640 0).\n"); - printf(" -plt - Specifies the VRAM offset of the CLUT (Default: 0 480).\n"); - printf(" -o - Sets the name of the output file (Default: .tim).\n"); - printf("\nExtra options:\n"); - printf(" -usealpha - Use alpha channel (if available) as transparency mask.\n"); - printf(" -alpt - Threshold value when alpha channel is used as transparency\n"); - printf(" mask (Default: 127).\n"); - printf(" -tindex - Specify color index to be treated as transparent (ignored on\n"); - printf(" non palletized images).\n"); - printf(" -tcol - Specify RGB color value to be treated as transparent.\n"); - printf(" -bpp - Specify color depth for the output TIM file\n"); - printf(" (Default: Color depth of source image, 24 is never default).\n"); - - /* - printf(" -tc - Specify color to be treated as transparent.\n"); - printf(" -bc - Specify blending color when converting alpha-blended pixels.\n"); - printf(" -bg - Specifies a background color for images with an alpha channel.\n"); - printf(" -tc - Sepecifies the color to be treated as transparent.\n"); - printf(" -qm - Sets the quantization method used for generating a CLUT when\n"); - printf(" converting true-color images to 4-bit/8-bit.\n"); - printf(" 0 - Simple 'color search' quantization (default)\n"); - printf(" 1 - Median-cut quantization\n"); - printf(" 2 - Median-cut quantization with dithering\n"); - */ - - printf("\nFor more info, please read img2tim.txt.\n"); - return(0); - - } - - - param::tim.imgXoffs = 640; - param::tim.imgYoffs = 0; - param::tim.clutXoffs = 0; - param::tim.clutYoffs = 480; - - - // Parse arguments - for(int i=1; iimgData = malloc(3*(image.w*image.h)); - - for(short py=0; pyimgData)[px+(image.w*py)].r = r; - ((tim::PIX_RGB24*)tim->imgData)[px+(image.w*py)].g = g; - ((tim::PIX_RGB24*)tim->imgData)[px+(image.w*py)].b = b; - - } - - } - - tim->format = 3; - tim->imgWidth = image.w; - tim->imgHeight = image.h; - - } else { // Convert image from 32-bit RGBA to 16-bit RGBi - - tim->imgData = malloc(2*(image.w*image.h)); - - for(short py=0; pyimgData)[px+(image.w*py)].r = r/8; - ((tim::PIX_RGB5*)tim->imgData)[px+(image.w*py)].g = g/8; - ((tim::PIX_RGB5*)tim->imgData)[px+(image.w*py)].b = b/8; - - if (param::UseAlphaMask == false) { - - // For fully-black pixels - if ((r == 0) && (g == 0) && (b == 0)) { - - if (param::BlackTrans) - ((tim::PIX_RGB5*)tim->imgData)[px+(image.w*py)].i = 1; - else - ((tim::PIX_RGB5*)tim->imgData)[px+(image.w*py)].i = 0; - - // For non-fully black pixels - } else { - - if (param::ColorTrans) - ((tim::PIX_RGB5*)tim->imgData)[px+(image.w*py)].i = 1; - else - ((tim::PIX_RGB5*)tim->imgData)[px+(image.w*py)].i = 0; - - } - - } else { - - if ((r == 0) && (g == 0) && (b == 0)) { - - if (a >= param::AlphaThresh) - ((tim::PIX_RGB5*)tim->imgData)[px+(image.w*py)].i = 1; - else - ((tim::PIX_RGB5*)tim->imgData)[px+(image.w*py)].i = 0; - - } else { - - if (a < param::AlphaThresh) { - - ((tim::PIX_RGB5*)tim->imgData)[px+(image.w*py)].r = 0; - ((tim::PIX_RGB5*)tim->imgData)[px+(image.w*py)].g = 0; - ((tim::PIX_RGB5*)tim->imgData)[px+(image.w*py)].b = 0; - ((tim::PIX_RGB5*)tim->imgData)[px+(image.w*py)].i = 0; - - } else { - - if (param::ColorTrans) - ((tim::PIX_RGB5*)tim->imgData)[px+(image.w*py)].i = 1; - else - ((tim::PIX_RGB5*)tim->imgData)[px+(image.w*py)].i = 0; - - } - - } - - } - - if ((param::TransColR == r) && (param::TransColG == g) && (param::TransColB == b)) { - - ((tim::PIX_RGB5*)tim->imgData)[px+(image.w*py)].r = 0; - ((tim::PIX_RGB5*)tim->imgData)[px+(image.w*py)].g = 0; - ((tim::PIX_RGB5*)tim->imgData)[px+(image.w*py)].b = 0; - ((tim::PIX_RGB5*)tim->imgData)[px+(image.w*py)].i = 0; - - } - - } - - } - - tim->format = 2; - tim->imgWidth = image.w; - tim->imgHeight = image.h; - - } - - } else if (image.fmt == 1) { // Convert 8-bit palletized - - if ((image.w%2) != 0) - printf("WARNING: Image width is not a multiple of 2, output may be broken.\n"); - - tim->clutData = malloc(2*256); - tim->clutWidth = 256; - tim->clutHeight = 1; - - for(short c=0; c<256; c++) { - - u_char r = ((RGBQUAD*)image.colors)[c].rgbRed; - u_char g = ((RGBQUAD*)image.colors)[c].rgbGreen; - u_char b = ((RGBQUAD*)image.colors)[c].rgbBlue; - - if (param::TransCol == -1) { - if ((param::TransColR == r) && (param::TransColG == g) && (param::TransColB == b)) { - param::TransCol = c; - } - } - - if (c != param::TransCol) { - - ((tim::PIX_RGB5*)tim->clutData)[c].r = r/8; - ((tim::PIX_RGB5*)tim->clutData)[c].g = g/8; - ((tim::PIX_RGB5*)tim->clutData)[c].b = b/8; - - // For fully-black pixels - if ((r == 0) && (g == 0) && (b == 0)) { - - if (param::BlackTrans) - ((tim::PIX_RGB5*)tim->clutData)[c].i = 1; - else - ((tim::PIX_RGB5*)tim->clutData)[c].i = 0; - - // For non-fully black pixels - } else { - - if (param::ColorTrans) - ((tim::PIX_RGB5*)tim->clutData)[c].i = 1; - else - ((tim::PIX_RGB5*)tim->clutData)[c].i = 0; - - } - - } else { - - ((tim::PIX_RGB5*)tim->clutData)[c].r = 0; - ((tim::PIX_RGB5*)tim->clutData)[c].g = 0; - ((tim::PIX_RGB5*)tim->clutData)[c].b = 0; - ((tim::PIX_RGB5*)tim->clutData)[c].i = 0; - - } - - } - - tim->imgData = malloc(image.w*image.h); - - for(short py=0; pyimgData)[image.w*py], &((u_char*)image.pixels)[image.w*py], image.w); - - } - - tim->format = 1; - tim->imgWidth = image.w; - tim->imgHeight = image.h; - - } else if (image.fmt == 2) { // Convert image for 4-bit TIM - - if ((image.w%4) != 0) - printf("WARNING: Image width is not a multiple of 4, output may be broken.\n"); - - tim->clutData = malloc(2*16); - tim->clutWidth = 16; - tim->clutHeight = 1; - - for(short c=0; c<16; c++) { - - u_char r = ((RGBQUAD*)image.colors)[c].rgbRed; - u_char g = ((RGBQUAD*)image.colors)[c].rgbGreen; - u_char b = ((RGBQUAD*)image.colors)[c].rgbBlue; - - if (param::TransCol == -1) { - if ((param::TransColR == r) && (param::TransColG == g) && (param::TransColB == b)) { - param::TransCol = c; - } - } - - if (c != param::TransCol) { - - ((tim::PIX_RGB5*)tim->clutData)[c].r = r/8; - ((tim::PIX_RGB5*)tim->clutData)[c].g = g/8; - ((tim::PIX_RGB5*)tim->clutData)[c].b = b/8; - - // For fully-black pixels - if ((r == 0) && (g == 0) && (b == 0)) { - - if (param::BlackTrans) - ((tim::PIX_RGB5*)tim->clutData)[c].i = 1; - else - ((tim::PIX_RGB5*)tim->clutData)[c].i = 0; - - // For non-fully black pixels - } else { - - if (param::ColorTrans) - ((tim::PIX_RGB5*)tim->clutData)[c].i = 1; - else - ((tim::PIX_RGB5*)tim->clutData)[c].i = 0; - - } - - } else { - - ((tim::PIX_RGB5*)tim->clutData)[c].r = 0; - ((tim::PIX_RGB5*)tim->clutData)[c].g = 0; - ((tim::PIX_RGB5*)tim->clutData)[c].b = 0; - ((tim::PIX_RGB5*)tim->clutData)[c].i = 0; - - } - - } - - tim->imgData = malloc((image.w/2)*image.h); - - for(short py=0; pyimgData)[px+((image.w/2)*py)] = ((pix&0xf)<<4)|((pix>>4)&0xf); - - } - - } - - tim->format = 0; - tim->imgWidth = image.w; - tim->imgHeight = image.h; - - } - - -} - - -int SimpleQuantize(tim::PARAM* tim, int bitDepth) { - - u_short colTable[256] = { 0 }; - int diffColors = 0; - bool newCol = true; - - if (bitDepth == 8) { - - if ((tim->imgWidth%2) != 0) - printf("WARNING: Image width is not a multiple of 2, output may be broken.\n"); - - } else { - - if ((tim->imgWidth%4) != 0) - printf("WARNING: Image width is not a multiple of 4, output may be broken.\n"); - - } - - for(int py=0; pyimgHeight; py++) { - for(int px=0; pximgWidth; px++) { - - u_short pix = ((u_short*)tim->imgData)[px+(tim->imgWidth*py)]; - - for(short c=0; c= 255) { - printf("ERROR: More than 256 colors found in image.\n"); - return(0); - } - - } else { - - if (diffColors >= 16) { - printf("ERROR: More than 16 colors found in image.\n"); - return(0); - } - - } - - colTable[diffColors] = pix; - diffColors++; - - newCol = false; - - } - - } - } - - u_short* srcImage = (u_short*)tim->imgData; - - if (bitDepth == 8) { - - tim->imgData = malloc(tim->imgWidth*tim->imgHeight); - - for(int py=0; pyimgHeight; py++) { - for(int px=0; pximgWidth; px++) { - - u_short pix = srcImage[px+(tim->imgWidth*py)]; - short index; - - for(index=0; indeximgData)[px+(tim->imgWidth*py)] = index; - } - - } - } - - } else { - - tim->imgData = malloc((tim->imgWidth/2)*tim->imgHeight); - - - for(int py=0; pyimgHeight; py++) { - for(int px=0; pximgWidth; px++) { - - u_short pix = srcImage[px+(tim->imgWidth*py)]; - short index; - - for(index=0; indeximgData)[(px/2)+((tim->imgWidth/2)*py)] = index; - } else { - ((u_char*)tim->imgData)[(px/2)+((tim->imgWidth/2)*py)] |= index<<4; - } - - - } - - } - } - - } - - free(srcImage); - - - if (bitDepth == 8) { - tim->clutData = malloc(2*256); - memcpy(tim->clutData, colTable, 2*256); - tim->clutWidth = 256; - } else { - tim->clutData = malloc(2*16); - memcpy(tim->clutData, colTable, 2*16); - tim->clutWidth = 16; - } - - tim->clutHeight = 1; - - if (bitDepth == 8) { - tim->format = 1; - } else { - tim->format = 0; - } - - return(1); - -} - - -int LoadImagePixels(const char* fileName, IMGPARAM* image, bool makeRGBA) { - - - // Check if file exists - if (access(fileName, F_OK) == -1) { - - printf("ERROR: File not found.\n"); - return(0); - - } - - - // Determine format of input file - FREE_IMAGE_FORMAT fif = FreeImage_GetFileType(fileName, 0); - - if (fif == FIF_UNKNOWN) { - - fif = FreeImage_GetFIFFromFilename(fileName); - - if (!FreeImage_FIFSupportsReading(fif)) { - - printf("ERROR: Unknown/unsupported image format.\n"); - return(0); - - } - - } - - - // Load the input image - FIBITMAP *srcImage = FreeImage_Load(fif, fileName, 0); - - if (srcImage == NULL) { - - printf("ERROR: Cannot load specified image file.\n"); - return(0); - - } - - // Some checks to make sure that the image is really valid - if (!FreeImage_HasPixels(srcImage)) { - - printf("ERROR: Source image has no pixel data... Somehow.\n"); - return(0); - - } - - - if ((makeRGBA) || (FreeImage_GetBPP(srcImage) == 24) || ((FreeImage_GetBPP(srcImage) > 32))) { - - // Convert to RGBA32 for 16-bit and 24-bit exports - FIBITMAP *tempImage; - - // Just to make things simpler, convert pixels to RGB32 when it is not palletized - tempImage = FreeImage_ConvertTo32Bits(srcImage); - - if (tempImage == NULL) { - - printf("ERROR: Could not convert image to RGBA32 for conversion.\n"); - FreeImage_Unload(srcImage); - return(0); - - } - - FreeImage_Unload(srcImage); - srcImage = tempImage; - - } - - - switch(FreeImage_GetBPP(srcImage)) { - case 32: // 32-bit images - - image->fmt = 0; - image->w = FreeImage_GetWidth(srcImage); - image->h = FreeImage_GetHeight(srcImage); - - image->numCols = 0; - image->colors = NULL; - image->pixels = malloc(4*(image->w*image->h)); - - for(short py=0; pyh; py++) { - - void* pixels = FreeImage_GetScanLine(srcImage, (image->h-py)-1); - memcpy(&((u_int*)image->pixels)[image->w*py], pixels, 4*image->w); - - for(short p=0; pw; p++) { - - u_char* pix = (u_char*)&((u_int*)image->pixels)[ p+(image->w*py) ]; - u_char t; - - t = pix[0]; - pix[0] = pix[2]; - pix[2] = t; - - } - - } - - break; - - case 8: // 8-bit palletized - - image->fmt = 1; - image->w = FreeImage_GetWidth(srcImage); - image->h = FreeImage_GetHeight(srcImage); - - image->numCols = 256; - image->colors = malloc(4*256); - memcpy(image->colors, FreeImage_GetPalette(srcImage), 4*256); - - image->pixels = malloc(image->w*image->h); - - for(short py=0; pyh; py++) { - - void* pixels = FreeImage_GetScanLine(srcImage, (image->h-py)-1); - memcpy(&((u_char*)image->pixels)[image->w*py], pixels, image->w); - - } - - break; - - case 4: // 4-bit palletized - - image->fmt = 2; - image->w = FreeImage_GetWidth(srcImage); - image->h = FreeImage_GetHeight(srcImage); - - image->numCols = 16; - image->colors = malloc(4*16); - memcpy(image->colors, FreeImage_GetPalette(srcImage), 4*16); - - image->pixels = malloc((image->w/2)*image->h); - - for(short py=0; pyh; py++) { - - void* pixels = FreeImage_GetScanLine(srcImage, (image->h-py)-1); - memcpy(&((u_char*)image->pixels)[(image->w/2)*py], pixels, image->w/2); - - } - - break; - - default: - - printf("ERROR: Unsupported color depth: %dbpp", FreeImage_GetBPP(srcImage)); - FreeImage_Unload(srcImage); - return(0); - - } - - - // Unload source image - FreeImage_Unload(srcImage); - - return(1); - -} - -void FreeImageStruct(IMGPARAM* image) { - - if (image->pixels != NULL) { - free(image->pixels); - image->pixels = NULL; - } - - if (image->colors != NULL) { - free(image->colors); - image->colors = NULL; - } - -} diff --git a/tim.cpp b/tim.cpp deleted file mode 100644 index f6bedc7..0000000 --- a/tim.cpp +++ /dev/null @@ -1,98 +0,0 @@ -#include "tim.h" - - -int tim::ExportFile(const char* fileName, tim::PARAM *param) { - - FILE *fp; - - if (!(fp = fopen(fileName, "wb"))) { - return(-1); - } - - - tim::HEADER fileHead={{0}}; - tim::CLUT_HEAD clutHead={0}; - tim::IMG_HEAD imgHead={0}; - - - // Prepare header - fileHead.id.id = 0x10; - fileHead.id.ver = 0; - fileHead.flags.pmode = param->format; - - - // Prepare CLUT data block if image is 8-bit or less and that the pointer to the CLUT data is not NULL - if ((param->format <= 1) && (param->clutData != NULL)) { - fileHead.flags.clut = 1; - clutHead.cw = param->clutWidth; - clutHead.ch = param->clutHeight; - clutHead.cx = param->clutXoffs; - clutHead.cy = param->clutYoffs; - clutHead.len = ((2*param->clutWidth)*param->clutHeight); - clutHead.len += sizeof(clutHead); - } - - - // Prepare image data block - imgHead.w = param->imgWidth; - imgHead.h = param->imgHeight; - imgHead.x = param->imgXoffs; - imgHead.y = param->imgYoffs; - - // Calculate final size of image based on its color depth - switch(param->format) { - case 0: // 4-bit with 16-color CLUT - imgHead.len = param->imgWidth/2; - imgHead.w /= 4; - break; - case 1: // 8-bit with 256-color CLUT - imgHead.len = param->imgWidth; - imgHead.w /= 2; - break; - case 2: // 16-bit RGB5I1 - imgHead.len = param->imgWidth*2; - break; - case 3: // 24-bit RGB8 - imgHead.len = (param->imgWidth*3); - imgHead.w = ceil(imgHead.w*1.5f); - break; - } - - // Calculate size of image data block - imgHead.len *= param->imgHeight; - imgHead.len += sizeof(imgHead); - - - // Write the header - fwrite(&fileHead, 1, sizeof(fileHead), fp); - - // Write the CLUT data block - if ((param->format <= 1) && (param->clutData != NULL)) { - fwrite(&clutHead, 1, sizeof(clutHead), fp); - fwrite(param->clutData, 1, clutHead.len-sizeof(clutHead), fp); - } - - // Write the image data block - fwrite(&imgHead, 1, sizeof(imgHead), fp); - fwrite(param->imgData, 1, imgHead.len-sizeof(imgHead), fp); - - // Close and return - fclose(fp); - return(0); - -} - - -void tim::FreeParam(tim::PARAM *param) { - - if (param->imgData != NULL) { - free(param->imgData); - param->imgData = NULL; - } - - if (param->clutData != NULL) { - free(param->clutData); - param->clutData = NULL; - } - -} diff --git a/tim.h b/tim.h deleted file mode 100644 index 87dc20d..0000000 --- a/tim.h +++ /dev/null @@ -1,96 +0,0 @@ -#ifndef _TIM_H -#define _TIM_H - -#include -#include -#include - -#define TIM_OUTPUT_CLUT4 0 -#define TIM_OUTPUT_CLUT8 1 -#define TIM_OUTPUT_RGB5 2 -#define TIM_OUTPUT_RGB24 3 - -namespace tim { - - - // TIM header struct - typedef struct { - - // ID sub-struct - struct HEADER_ID { - u_int id:8; // Always 0x10 - u_int ver:8; // Always 0 - u_int pad:16; // Useless padding - } id; - - // Flags sub-struct - struct HEADER_FLAGS { - u_int pmode:3; // Pixel mode (0: 4-bit, 1: 8-bit, 2:16-bit, 3:24-bit) - u_int clut:1; - u_int pad:24; - } flags; - - } HEADER; - - - // CLUT header struct - typedef struct { - u_int len; - u_short cx,cy; - u_short cw,ch; - } CLUT_HEAD; - - - // Image data block header - typedef struct { - u_int len; - u_short x,y; - u_short w,h; - } IMG_HEAD; - - - typedef struct { - // 0: 4-bit CLUT, 1: 8-bit CLUT, 2:16-bit, 3:24-bit - int format; - // Image data params - void *imgData; - u_short imgWidth,imgHeight; - u_short imgXoffs,imgYoffs; - // CLUT data params - void *clutData; - u_short clutWidth,clutHeight; - u_short clutXoffs,clutYoffs; - } PARAM; - - - // RGB5A1 pixel format struct - typedef struct { - u_short r:5; - u_short g:5; - u_short b:5; - u_short i:1; - } PIX_RGB5; - - typedef struct { - u_char r; - u_char g; - u_char b; - } PIX_RGB24; - - - /*! tim::ExportFile() - * - * /param[in] fileName - Name of TIM file. - * /param[in] *param - tim::PARAM object of TIM export parameters. - * - * /returns Zero if the TIM file was written successfully, otherwise an error occured. - * - */ - int ExportFile(const char* fileName, tim::PARAM *param); - - void FreeParam(tim::PARAM *param); - -}; - - -#endif // _TIM_H