diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 52a7bff4c..657ecf812 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -14,6 +14,7 @@
+
diff --git a/app/build.gradle b/app/build.gradle
index d7c803272..9dd4a7b93 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -180,7 +180,7 @@ dependencies {
// https://github.com/divStar/ico4a
// May have to switch to https://mvnrepository.com/artifact/org.jclarion/image4j
- implementation 'divstar:ico4a:v1.0'
+ implementation project(':ico4a')
// https://github.com/square/okhttp
// Note: 3.13 requires API 21+
diff --git a/ico4a/.gitignore b/ico4a/.gitignore
new file mode 100644
index 000000000..796b96d1c
--- /dev/null
+++ b/ico4a/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/ico4a/LICENSE b/ico4a/LICENSE
new file mode 100644
index 000000000..9cecc1d46
--- /dev/null
+++ b/ico4a/LICENSE
@@ -0,0 +1,674 @@
+ 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/ico4a/README.md b/ico4a/README.md
new file mode 100644
index 000000000..9fcfd1d5a
--- /dev/null
+++ b/ico4a/README.md
@@ -0,0 +1,41 @@
+# ico4a
+This is a library to decode ICO files into a list of Bitmap-objects - based on [image4j project](https://github.com/imcdonagh/image4j "image4j") (I took the liberty to use a similar structure, classes and methods, so credits go to the authors of image4j as well!).
+There is a demo android application included, which shows off the library's functionality. This app is not bullet-proofed so take everything with caution.
+
+## Usage
+### Add dependency to your project and module
+The easiest way to include ico4a in your project, is to include the jcenter repository in your **project's _build.gradle_** and the following line in your **module's _build.gradle_**'s dependencies-section:
+```Gradle
+compile 'divstar:ico4a:v1.0'
+```
+Alternatively you may download the AAR from [ico4a's gitHub releases site](https://github.com/divStar/ico4a/releases), create a new module (chose "import AAR" in the following dialog) and add the dependency to your app's project manually.
+
+### Use the ICODecoder.read(InputStream) method
+After having done so, use the following line anywhere to decode an ICO-InputStream into a List of Bitmap-objects:
+```Java
+List images = ICODecoder.read(SOME_INPUTSTREAM);
+```
+
+I suggest creating an AsyncTask to download and read the file, because while reading the file is a rather quick task, it still might result in UI thread blocking.
+
+See the sample app included in the gitHub repository to get an idea of how to use it.
+
+
+
+## Limitations
+ico4a cannot write ICO files, because I did not need it myself. Some methods for writing an ICO file are already present, others are not. In particular I have avoided coding BMPEncoder and ICOEncoder, which you will find in the [image4j project](https://github.com/imcdonagh/image4j "image4j library"). Thus you will have to implement them yourself if you need them.
+You can however save each of the resulting Bitmap-objects easily using Android's built-in mechanisms. Here is an example:
+```Java
+ File file = new File(dir, "output.png");
+ FileOutputStream fOut = new FileOutputStream(file);
+
+ bmp.compress(Bitmap.CompressFormat.PNG, 100, fOut);
+ fOut.flush();
+ fOut.close();
+```
+
+## Stability
+ico4a has been tested with various single- and multi-image ICO files. It has been tested to support 1-, 4-, 8-, 24- and 32-bit uncompressed images with and without alpha transparency. In addition 24- and 32-bit PNG-compressed images with and without alpha transparency have been tested. All of them loaded without any problems.
+
+## Final word
+Please report any problems if you encounter them and I will see if I can help solve them.
diff --git a/ico4a/build.gradle b/ico4a/build.gradle
new file mode 100644
index 000000000..8f607c66e
--- /dev/null
+++ b/ico4a/build.gradle
@@ -0,0 +1,29 @@
+apply plugin: 'com.android.library'
+
+android {
+ compileSdk rootProject.ext.compileSdkVersion
+ namespace 'divstar.icon4a'
+
+ defaultConfig {
+ minSdkVersion 15
+ }
+
+ lintOptions {
+ abortOnError false
+ }
+
+ compileOptions {
+ sourceCompatibility JavaVersion.VERSION_1_8
+ targetCompatibility JavaVersion.VERSION_1_8
+ }
+
+ sourceSets.test.java.srcDirs = []
+ buildFeatures {
+ buildConfig true
+ }
+}
+
+dependencies {
+ implementation "androidx.appcompat:appcompat:$appcompatVersion"
+ implementation "androidx.annotation:annotation:${annotationVersion}"
+}
diff --git a/ico4a/release_notes.md b/ico4a/release_notes.md
new file mode 100644
index 000000000..4da6b7902
--- /dev/null
+++ b/ico4a/release_notes.md
@@ -0,0 +1,5 @@
+In this release everything works as supposed (at least to me): ICO files can be decoded from any InputStream and one receives a List.
+
+If you need the actual release, go into the ico4a build folder and grab the AAR-library, create a new module in Android Studio, chose "import AAR" and select the file. It will create a module in your project and you should add it as a dependency to your project.
+
+Currently it seems the file cannot be retrieved via jcenter (I have to fiddle with it some more).
diff --git a/ico4a/src/main/AndroidManifest.xml b/ico4a/src/main/AndroidManifest.xml
new file mode 100644
index 000000000..0bfa73ba6
--- /dev/null
+++ b/ico4a/src/main/AndroidManifest.xml
@@ -0,0 +1 @@
+
diff --git a/ico4a/src/main/java/divstar/ico4a/codec/bmp/BMPConstants.java b/ico4a/src/main/java/divstar/ico4a/codec/bmp/BMPConstants.java
new file mode 100644
index 000000000..4b13a750d
--- /dev/null
+++ b/ico4a/src/main/java/divstar/ico4a/codec/bmp/BMPConstants.java
@@ -0,0 +1,54 @@
+package divstar.ico4a.codec.bmp;
+
+/**
+ * Provides constants used with BMP format.
+ *
+ * @author Ian McDonagh
+ */
+public class BMPConstants {
+
+ /**
+ * The signature for the BMP format header "BM".
+ */
+ public static final String FILE_HEADER = "BM";
+ /**
+ * Specifies no compression.
+ *
+ * @see InfoHeader#iCompression InfoHeader
+ */
+ public static final int BI_RGB = 0; // no compression
+ /**
+ * Specifies 8-bit RLE compression.
+ *
+ * @see InfoHeader#iCompression InfoHeader
+ */
+ public static final int BI_RLE8 = 1; // 8bit RLE compression
+ /**
+ * Specifies 4-bit RLE compression.
+ *
+ * @see InfoHeader#iCompression InfoHeader
+ */
+ public static final int BI_RLE4 = 2; // 4bit RLE compression
+ /**
+ * Specifies 16-bit or 32-bit "bit field" compression.
+ *
+ * @see InfoHeader#iCompression InfoHeader
+ */
+ public static final int BI_BITFIELDS = 3; // 16bit or 32bit "bit field"
+ /**
+ * Specifies JPEG compression.
+ *
+ * @see InfoHeader#iCompression InfoHeader
+ */
+ public static final int BI_JPEG = 4; // _JPEG compression
+ // compression.
+ /**
+ * Specifies PNG compression.
+ *
+ * @see InfoHeader#iCompression InfoHeader
+ */
+ public static final int BI_PNG = 5; // PNG compression
+
+ private BMPConstants() {
+ }
+}
diff --git a/ico4a/src/main/java/divstar/ico4a/codec/bmp/BMPDecoder.java b/ico4a/src/main/java/divstar/ico4a/codec/bmp/BMPDecoder.java
new file mode 100644
index 000000000..1c9231141
--- /dev/null
+++ b/ico4a/src/main/java/divstar/ico4a/codec/bmp/BMPDecoder.java
@@ -0,0 +1,681 @@
+package divstar.ico4a.codec.bmp;
+
+import android.graphics.Bitmap;
+import android.graphics.Color;
+
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+import divstar.ico4a.io.CountingInputStream;
+import divstar.ico4a.io.LittleEndianInputStream;
+
+/**
+ * Decodes images in BMP format.
+ *
+ * @author Ian McDonagh
+ * @author Igor Tykhyy
+ */
+public class BMPDecoder {
+
+ private Bitmap img;
+ private InfoHeader infoHeader;
+
+ /**
+ * Creates a new instance of BMPDecoder and reads the BMP data from the source.
+ *
+ * @param in the source InputStream from which to read the BMP data
+ * @throws IOException if an error occurs
+ */
+ public BMPDecoder(InputStream in) throws IOException {
+ LittleEndianInputStream lis = new LittleEndianInputStream(new CountingInputStream(in));
+
+ /* header [14] */
+
+ //signature "BM" [2]
+ byte[] bsignature = new byte[2];
+ lis.read(bsignature);
+ String signature = new String(bsignature, "UTF-8");
+
+ if (!signature.equals("BM")) {
+ throw new IOException("Invalid signature '" + signature + "' for BMP format");
+ }
+
+ //file size [4]
+ lis.readIntLE();
+
+ //reserved = 0 [4]
+ lis.readIntLE();
+
+ //DataOffset [4] file offset to raster data
+ lis.readIntLE();
+
+ /* info header [40] */
+
+ infoHeader = readInfoHeader(lis);
+
+ /* Color table and Raster data */
+
+ img = read(infoHeader, lis);
+ }
+
+ /**
+ * Retrieves a bit from the lowest order byte of the given integer.
+ *
+ * @param bits the source integer, treated as an unsigned byte
+ * @param index the index of the bit to retrieve, which must be in the range 0..7.
+ * @return the bit at the specified index, which will be either 0 or 1.
+ */
+ private static int getBit(int bits, int index) {
+ return (bits >> (7 - index)) & 1;
+ }
+
+ /**
+ * Retrieves a nibble (4 bits) from the lowest order byte of the given integer.
+ *
+ * @param nibbles the source integer, treated as an unsigned byte
+ * @param index the index of the nibble to retrieve, which must be in the range 0..1.
+ * @return the nibble at the specified index, as an unsigned byte.
+ */
+ private static int getNibble(int nibbles, int index) {
+ return (nibbles >> (4 * (1 - index))) & 0xF;
+ }
+
+ private static void getColorTable(ColorEntry[] colorTable, int[] ar, int[] ag, int[] ab) {
+ for (int i = 0; i < colorTable.length; i++) {
+ ar[i] = colorTable[i].bRed & 0xFF;
+ ag[i] = colorTable[i].bGreen & 0xFF;
+ ab[i] = colorTable[i].bBlue & 0xFF;
+ }
+ }
+
+ /**
+ * Reads the BMP info header structure from the given InputStream.
+ *
+ * @param lis the InputStream to read
+ * @return the InfoHeader structure
+ * @throws IOException if an error occurred
+ */
+ public static InfoHeader readInfoHeader(LittleEndianInputStream lis) throws IOException {
+ return new InfoHeader(lis);
+ }
+
+ public static InfoHeader readInfoHeader(LittleEndianInputStream lis, int infoSize) throws IOException {
+ return new InfoHeader(lis, infoSize);
+ }
+
+ /**
+ * Reads the BMP data from the given InputStream using the information
+ * contained in the InfoHeader.
+ *
+ * @param lis the source input
+ * @param infoHeader an InfoHeader that was read by a call to
+ * {@link #readInfoHeader(net.sf.image4j.io.LittleEndianInputStream) readInfoHeader()}.
+ * @return the decoded image read from the source input
+ * @throws IOException if an error occurs
+ */
+ public static Bitmap read(InfoHeader infoHeader, LittleEndianInputStream lis) throws IOException {
+ Bitmap img;
+
+ /* Color table (palette) */
+
+ ColorEntry[] colorTable = null;
+
+ //color table is only present for 1, 4 or 8 bit (indexed) images
+ if (infoHeader.sBitCount <= 8) {
+ colorTable = readColorTable(infoHeader, lis);
+ }
+
+ img = read(infoHeader, lis, colorTable);
+
+ return img;
+ }
+
+ /**
+ * Reads the BMP data from the given InputStream using the information
+ * contained in the InfoHeader.
+ *
+ * @param colorTable ColorEntry array containing palette
+ * @param infoHeader an InfoHeader that was read by a call to
+ * {@link #readInfoHeader(net.sf.image4j.io.LittleEndianInputStream) readInfoHeader()}.
+ * @param lis the source input
+ * @return the decoded image read from the source input
+ * @throws IOException if any error occurs
+ */
+ public static Bitmap read(InfoHeader infoHeader, LittleEndianInputStream lis, ColorEntry[] colorTable) throws IOException {
+
+ switch(infoHeader.iCompression) {
+
+ case BMPConstants.BI_RGB:
+
+ switch(infoHeader.sBitCount) {
+ case 1: return read1(infoHeader, lis, colorTable);
+ case 4: return read4(infoHeader, lis, colorTable);
+ case 8: return read8(infoHeader, lis, colorTable);
+ case 16: return read16(infoHeader, lis);
+ case 24: return read24(infoHeader, lis);
+ case 32: return read32(infoHeader, lis);
+ default: throw new IOException("Unrecognized bitmap format: bit count=" + infoHeader.sBitCount);
+ }
+
+ case BMPConstants.BI_BITFIELDS:
+
+ switch(infoHeader.sBitCount) {
+ case 16: return read16BitFields(infoHeader, lis);
+ case 32: return read32BitFields(infoHeader, lis);
+ default: throw new IOException("Unrecognized bitmap format: bit count=" + infoHeader.sBitCount);
+ }
+
+ default:
+
+ throw new IOException("Unsupported bitmap format: compression=" + infoHeader.iCompression);
+ }
+ }
+
+ /**
+ * Reads the ColorEntry table from the given InputStream using
+ * the information contained in the given infoHeader.
+ *
+ * @param infoHeader the InfoHeader structure, which was read using
+ * {@link #readInfoHeader(net.sf.image4j.io.LittleEndianInputStream) readInfoHeader()}
+ * @param lis the InputStream to read
+ * @return the decoded image read from the source input
+ * @throws IOException if an error occurs
+ */
+ public static ColorEntry[] readColorTable(InfoHeader infoHeader, LittleEndianInputStream lis) throws IOException {
+ ColorEntry[] colorTable = new ColorEntry[infoHeader.iNumColors];
+ for (int i = 0; i < infoHeader.iNumColors; i++) {
+ ColorEntry ce = new ColorEntry(lis);
+ colorTable[i] = ce;
+ }
+ return colorTable;
+ }
+
+ /**
+ * Reads 1-bit uncompressed bitmap raster data, which may be monochrome depending on the
+ * palette entries in colorTable.
+ *
+ * @param infoHeader the InfoHeader structure, which was read using
+ * {@link #readInfoHeader(net.sf.image4j.io.LittleEndianInputStream) readInfoHeader()}
+ * @param lis the source input
+ * @param colorTable ColorEntry array specifying the palette, which
+ * must not be null.
+ * @return the decoded image read from the source input
+ * @throws IOException if an error occurs
+ */
+ public static Bitmap read1(InfoHeader infoHeader, LittleEndianInputStream lis, ColorEntry[] colorTable) throws IOException {
+ //1 bit per pixel or 8 pixels per byte
+ //each pixel specifies the palette index
+
+ int[] ar = new int[colorTable.length];
+ int[] ag = new int[colorTable.length];
+ int[] ab = new int[colorTable.length];
+
+ getColorTable(colorTable, ar, ag, ab);
+
+ // Create indexed image
+ Bitmap img = Bitmap.createBitmap(infoHeader.iWidth, infoHeader.iHeight, Bitmap.Config.ARGB_8888);
+ // We'll use the raster to set samples instead of RGB values.
+ // The SampleModel of an indexed image interprets samples as
+ // the index of the colour for a pixel, which is perfect for use here.
+
+ //padding
+ int bitsPerLine = infoHeader.iWidth;
+ if (bitsPerLine % 32 != 0) {
+ bitsPerLine = (bitsPerLine / 32 + 1) * 32;
+ }
+
+ int bytesPerLine = bitsPerLine / 8;
+ int[] line = new int[bytesPerLine];
+
+ for (int y = infoHeader.iHeight - 1; y >= 0; y--) {
+ for (int i = 0; i < bytesPerLine; i++) {
+ line[i] = lis.readUnsignedByte();
+ }
+
+ for (int x = 0; x < infoHeader.iWidth; x++) {
+ int i = x / 8;
+ int v = line[i];
+ int b = x % 8;
+ int index = getBit(v, b);
+ img.setPixel(x, y, Color.rgb(ar[index], ag[index], ab[index]));
+ }
+ }
+
+ return img;
+ }
+
+ /**
+ * Reads 4-bit uncompressed bitmap raster data, which is interpreted based on the colours
+ * specified in the palette.
+ *
+ * @param infoHeader the InfoHeader structure, which was read using
+ * {@link #readInfoHeader(net.sf.image4j.io.LittleEndianInputStream) readInfoHeader()}
+ * @param lis the source input
+ * @param colorTable ColorEntry array specifying the palette, which
+ * must not be null.
+ * @return the decoded image read from the source input
+ * @throws IOException if an error occurs
+ */
+ public static Bitmap read4(InfoHeader infoHeader, LittleEndianInputStream lis, ColorEntry[] colorTable) throws IOException {
+
+ // 2 pixels per byte or 4 bits per pixel.
+ // Colour for each pixel specified by the color index in the pallette.
+
+ int[] ar = new int[colorTable.length];
+ int[] ag = new int[colorTable.length];
+ int[] ab = new int[colorTable.length];
+
+ getColorTable(colorTable, ar, ag, ab);
+
+ Bitmap img = Bitmap.createBitmap(infoHeader.iWidth, infoHeader.iHeight, Bitmap.Config.ARGB_8888);
+
+ //padding
+ int bitsPerLine = infoHeader.iWidth * 4;
+ if (bitsPerLine % 32 != 0) {
+ bitsPerLine = (bitsPerLine / 32 + 1) * 32;
+ }
+ int bytesPerLine = bitsPerLine / 8;
+
+ int[] line = new int[bytesPerLine];
+
+ for (int y = infoHeader.iHeight - 1; y >= 0; y--) {
+ //scan line
+ for (int i = 0; i < bytesPerLine; i++) {
+ int b = lis.readUnsignedByte();
+ line[i] = b;
+ }
+
+ //get pixels
+ for (int x = 0; x < infoHeader.iWidth; x++) {
+ //get byte index for line
+ int b = x / 2; // 2 pixels per byte
+ int i = x % 2;
+ int n = line[b];
+ int index = getNibble(n, i);
+ img.setPixel(x, y, Color.rgb(ar[index], ag[index], ab[index]));
+ }
+ }
+
+ return img;
+ }
+
+ /**
+ * Reads 8-bit uncompressed bitmap raster data, which is interpreted based on the colours
+ * specified in the palette.
+ *
+ * @param infoHeader the InfoHeader structure, which was read using
+ * {@link #readInfoHeader(net.sf.image4j.io.LittleEndianInputStream) readInfoHeader()}
+ * @param lis the source input
+ * @param colorTable ColorEntry array specifying the palette, which
+ * must not be null.
+ * @return the decoded image read from the source input
+ * @throws IOException if an error occurs
+ */
+ public static Bitmap read8(InfoHeader infoHeader, LittleEndianInputStream lis, ColorEntry[] colorTable) throws IOException {
+ //1 byte per pixel
+ // color index 1 (index of color in palette)
+ //lines padded to nearest 32bits
+ //no alpha
+
+ int[] ar = new int[colorTable.length];
+ int[] ag = new int[colorTable.length];
+ int[] ab = new int[colorTable.length];
+
+ getColorTable(colorTable, ar, ag, ab);
+
+ Bitmap img = Bitmap.createBitmap(infoHeader.iWidth, infoHeader.iHeight, Bitmap.Config.ARGB_8888);
+
+ //create color pallette
+ int[] c = new int[infoHeader.iNumColors];
+ for (int i = 0; i < c.length; i++) {
+ int r = colorTable[i].bRed;
+ int g = colorTable[i].bGreen;
+ int b = colorTable[i].bBlue;
+ c[i] = (r << 16) | (g << 8) | (b);
+ }
+
+ //padding
+ int dataPerLine = infoHeader.iWidth;
+ int bytesPerLine = dataPerLine;
+ if (bytesPerLine % 4 != 0) {
+ bytesPerLine = (bytesPerLine / 4 + 1) * 4;
+ }
+ int padBytesPerLine = bytesPerLine - dataPerLine;
+
+ for (int y = infoHeader.iHeight - 1; y >= 0; y--) {
+ for (int x = 0; x < infoHeader.iWidth; x++) {
+ int b = lis.readUnsignedByte();
+ img.setPixel(x, y, Color.argb(255, Color.red(c[b]), Color.green(c[b]), Color.blue(c[b])));
+ }
+
+ lis.skip(padBytesPerLine);
+ }
+
+ return img;
+ }
+
+ /**
+ * Reads 16-bit uncompressed bitmap raster data.
+ *
+ * @param lis the source input
+ * @param infoHeader the InfoHeader structure, which was read using
+ * {@link #readInfoHeader(net.sf.image4j.io.LittleEndianInputStream) readInfoHeader()}
+ * @return the decoded image read from the source input
+ * @throws IOException if an error occurs
+ */
+ public static Bitmap read16(InfoHeader infoHeader, LittleEndianInputStream lis) throws IOException {
+
+ if(infoHeader.iCompression != BMPConstants.BI_RGB)
+ throw new IOException("Expected BI_RGB compression but got " + infoHeader.iCompression + ".");
+
+ Bitmap img = Bitmap.createBitmap(infoHeader.iWidth, infoHeader.iHeight, Bitmap.Config.ARGB_8888);
+
+ int rowPadding = (4 - infoHeader.iWidth * 2 % 4) % 4;
+
+ for (int y = infoHeader.iHeight - 1; y >= 0; --y) {
+
+ for (int x = 0; x < infoHeader.iWidth; ++x) {
+
+ int pixel = lis.readUnsignedShortLE();
+
+ int r = Math.round((float) ((pixel & 0b0111110000000000) >> 10) / 31 * 255);
+ int g = Math.round((float) ((pixel & 0b0000001111100000) >> 05) / 31 * 255);
+ int b = Math.round((float) ((pixel & 0b0000000000011111) >> 00) / 31 * 255);
+
+ img.setPixel(x, y, Color.argb(255, r, g, b));
+ }
+
+ lis.skip(rowPadding, true);
+ }
+
+ return img;
+ }
+
+ /**
+ * Reads 24-bit uncompressed bitmap raster data.
+ *
+ * @param lis the source input
+ * @param infoHeader the InfoHeader structure, which was read using
+ * {@link #readInfoHeader(net.sf.image4j.io.LittleEndianInputStream) readInfoHeader()}
+ * @return the decoded image read from the source input
+ * @throws IOException if an error occurs
+ */
+ public static Bitmap read24(InfoHeader infoHeader, LittleEndianInputStream lis) throws IOException {
+ //3 bytes per pixel
+ // blue 1
+ // green 1
+ // red 1
+ // lines padded to nearest 32 bits
+ // no alpha
+
+ Bitmap img = Bitmap.createBitmap(infoHeader.iWidth, infoHeader.iHeight, Bitmap.Config.ARGB_8888);
+
+ //padding to nearest 32 bits
+ int dataPerLine = infoHeader.iWidth * 3;
+ int bytesPerLine = dataPerLine;
+ if (bytesPerLine % 4 != 0) {
+ bytesPerLine = (bytesPerLine / 4 + 1) * 4;
+ }
+ int padBytesPerLine = bytesPerLine - dataPerLine;
+
+ for (int y = infoHeader.iHeight - 1; y >= 0; y--) {
+ for (int x = 0; x < infoHeader.iWidth; x++) {
+ int b = lis.readUnsignedByte();
+ int g = lis.readUnsignedByte();
+ int r = lis.readUnsignedByte();
+
+ img.setPixel(x, y, Color.rgb(r, g, b));
+ }
+ lis.skip(padBytesPerLine);
+ }
+
+ return img;
+ }
+
+ /**
+ * Reads 32-bit uncompressed bitmap raster data, with transparency.
+ *
+ * @param lis the source input
+ * @param infoHeader the InfoHeader structure, which was read using
+ * {@link #readInfoHeader(net.sf.image4j.io.LittleEndianInputStream) readInfoHeader()}
+ * @return the decoded image read from the source input
+ * @throws IOException if an error occurs
+ */
+ public static Bitmap read32(InfoHeader infoHeader, LittleEndianInputStream lis) throws IOException {
+ //4 bytes per pixel
+ // blue 1
+ // green 1
+ // red 1
+ // alpha 1
+ //No padding since each pixel = 32 bits
+
+ Bitmap img = Bitmap.createBitmap(infoHeader.iWidth, infoHeader.iHeight, Bitmap.Config.ARGB_8888);
+
+ for (int y = infoHeader.iHeight - 1; y >= 0; y--) {
+ for (int x = 0; x < infoHeader.iWidth; x++) {
+ int b = lis.readUnsignedByte();
+ int g = lis.readUnsignedByte();
+ int r = lis.readUnsignedByte();
+ int a = lis.readUnsignedByte();
+ img.setPixel(x, y, Color.argb(a, r, g, b));
+ }
+ }
+
+ return img;
+ }
+
+ /**
+ * Reads 16-bit uncompressed bitmap raster data, with a bit mask for each color channel.
+ *
+ * @param lis the source input
+ * @param infoHeader the InfoHeader structure, which was read using
+ * {@link #readInfoHeader(net.sf.image4j.io.LittleEndianInputStream) readInfoHeader()} and
+ * has {@link InfoHeader#iCompression} set to {@link BMPConstants#BI_BITFIELDS}.
+ * @return the decoded image read from the source input
+ * @throws IOException if an error occurs
+ */
+ public static Bitmap read16BitFields(InfoHeader infoHeader, LittleEndianInputStream lis) throws IOException {
+
+ if(infoHeader.iCompression != BMPConstants.BI_BITFIELDS)
+ throw new IOException("Expected BI_BITFIELDS compression but got " + infoHeader.iCompression + ".");
+
+ Bitmap img = Bitmap.createBitmap(infoHeader.iWidth, infoHeader.iHeight, Bitmap.Config.ARGB_8888);
+
+ // Read masks.
+
+ long rm = lis.readUnsignedIntLE();
+ long gm = lis.readUnsignedIntLE();
+ long bm = lis.readUnsignedIntLE();
+
+ // Offset of mask (at which bit its color channel starts in a pixel).
+
+ int rs = Long.numberOfTrailingZeros(rm);
+ int gs = Long.numberOfTrailingZeros(gm);
+ int bs = Long.numberOfTrailingZeros(bm);
+
+ // Length of mask (the number of bits in its color channel).
+
+ int rl = Long.bitCount(rm);
+ int gl = Long.bitCount(gm);
+ int bl = Long.bitCount(bm);
+
+ // Range of mask (the highest possible number in its color channel).
+
+ int rr = (1 << rl) - 1;
+ int gr = (1 << gl) - 1;
+ int br = (1 << bl) - 1;
+
+ int rowPadding = (4 - infoHeader.iWidth * 2 % 4) % 4;
+
+ for (int y = infoHeader.iHeight - 1; y >= 0; --y) {
+
+ for (int x = 0; x < infoHeader.iWidth; ++x) {
+
+ int pixel = lis.readUnsignedShortLE();
+
+ // Mask and shift the color channel from the pixel and then scale it into 8-bit representation.
+
+ int r = Math.round((float) ((pixel & rm) >> rs) / rr * 255);
+ int g = Math.round((float) ((pixel & gm) >> gs) / gr * 255);
+ int b = Math.round((float) ((pixel & bm) >> bs) / br * 255);
+
+ img.setPixel(x, y, Color.argb(255, r, g, b));
+ }
+
+ lis.skip(rowPadding, true);
+ }
+
+ return img;
+ }
+
+ /**
+ * Reads 32-bit uncompressed bitmap raster data, with transparency and a bit mask for each color channel.
+ *
+ * @param lis the source input
+ * @param infoHeader the InfoHeader structure, which was read using
+ * {@link #readInfoHeader(net.sf.image4j.io.LittleEndianInputStream) readInfoHeader()} and
+ * has {@link InfoHeader#iCompression} set to {@link BMPConstants#BI_BITFIELDS}.
+ * @return the decoded image read from the source input
+ * @throws IOException if an error occurs
+ */
+ public static Bitmap read32BitFields(InfoHeader infoHeader, LittleEndianInputStream lis) throws IOException {
+
+ if(infoHeader.iCompression != BMPConstants.BI_BITFIELDS)
+ throw new IOException("Expected BI_BITFIELDS compression but got " + infoHeader.iCompression + ".");
+
+ Bitmap img = Bitmap.createBitmap(infoHeader.iWidth, infoHeader.iHeight, Bitmap.Config.ARGB_8888);
+
+ // Read masks.
+
+ long rm = lis.readUnsignedIntLE();
+ long gm = lis.readUnsignedIntLE();
+ long bm = lis.readUnsignedIntLE();
+ long am = ~(rm | gm | bm) & 0xffffffffl;
+
+ // Offset of mask (at which bit its color channel starts in a pixel).
+
+ int rs = Long.numberOfTrailingZeros(rm);
+ int gs = Long.numberOfTrailingZeros(gm);
+ int bs = Long.numberOfTrailingZeros(bm);
+ int as = Long.numberOfTrailingZeros(am);
+
+ // Length of mask (the number of bits in its color channel).
+
+ int rl = Long.bitCount(rm);
+ int gl = Long.bitCount(gm);
+ int bl = Long.bitCount(bm);
+ int al = Long.bitCount(am);
+
+ // Range of mask (the highest possible number in its color channel).
+
+ int rr = (1 << rl) - 1;
+ int gr = (1 << gl) - 1;
+ int br = (1 << bl) - 1;
+ int ar = (1 << al) - 1;
+
+ for (int y = infoHeader.iHeight - 1; y >= 0; --y) {
+
+ for (int x = 0; x < infoHeader.iWidth; ++x) {
+
+ long pixel = lis.readUnsignedIntLE();
+
+ // Mask and shift the color channel from the pixel and then scale it into 8-bit representation.
+
+ int r = Math.round((float) ((pixel & rm) >> rs) / rr * 255);
+ int g = Math.round((float) ((pixel & gm) >> gs) / gr * 255);
+ int b = Math.round((float) ((pixel & bm) >> bs) / br * 255);
+ int a = Math.round((float) ((pixel & am) >> as) / ar * 255);
+
+ img.setPixel(x, y, Color.argb(a, r, g, b));
+ }
+ }
+
+ return img;
+ }
+
+ /**
+ * Reads and decodes BMP data from the source file.
+ *
+ * @param file the source file
+ * @return the decoded image read from the source file
+ * @throws IOException if an error occurs
+ */
+ public static Bitmap read(File file) throws IOException {
+ FileInputStream fin = new FileInputStream(file);
+ try {
+ return read(new BufferedInputStream(fin));
+ } finally {
+ try {
+ fin.close();
+ } catch (IOException ex) {
+ ex.printStackTrace();
+ }
+ }
+ }
+
+ /**
+ * Reads and decodes BMP data from the source input.
+ *
+ * @param in the source input
+ * @return the decoded image read from the source file
+ * @throws IOException if an error occurs
+ */
+ public static Bitmap read(InputStream in) throws IOException {
+ BMPDecoder d = new BMPDecoder(in);
+ return d.getBitmap();
+ }
+
+ /**
+ * Reads and decodes BMP data from the source file, together with metadata.
+ *
+ * @param file the source file
+ * @return the decoded image read from the source file
+ * @throws IOException if an error occurs
+ */
+ public static BMPImage readExt(File file) throws IOException {
+ FileInputStream fin = new FileInputStream(file);
+ try {
+ return readExt(new BufferedInputStream(fin));
+ } finally {
+ try {
+ fin.close();
+ } catch (IOException ex) {
+ ex.printStackTrace();
+ }
+ }
+ }
+
+ /**
+ * Reads and decodes BMP data from the source input, together with metadata.
+ *
+ * @param in the source input
+ * @return the decoded image read from the source file
+ * @throws IOException if an error occurs
+ */
+ public static BMPImage readExt(InputStream in) throws IOException {
+ BMPDecoder d = new BMPDecoder(in);
+ return new BMPImage(d.getBitmap(), d.getInfoHeader());
+ }
+
+ /**
+ * The InfoHeader structure, which provides information about the BMP data.
+ *
+ * @return the InfoHeader structure that was read from the source data when this BMPDecoder
+ * was created.
+ */
+ public InfoHeader getInfoHeader() {
+ return infoHeader;
+ }
+
+ /**
+ * The decoded image read from the source input.
+ *
+ * @return the BufferedImage representing the BMP image.
+ */
+ public Bitmap getBitmap() {
+ return img;
+ }
+}
diff --git a/ico4a/src/main/java/divstar/ico4a/codec/bmp/BMPImage.java b/ico4a/src/main/java/divstar/ico4a/codec/bmp/BMPImage.java
new file mode 100644
index 000000000..10c8d0ef9
--- /dev/null
+++ b/ico4a/src/main/java/divstar/ico4a/codec/bmp/BMPImage.java
@@ -0,0 +1,106 @@
+package divstar.ico4a.codec.bmp;
+
+import android.graphics.Bitmap;
+
+/**
+ * Contains a decoded BMP image, as well as information about the source encoded image.
+ *
+ * @author Ian McDonagh
+ * @author Igor Tykhyy
+ */
+public class BMPImage {
+
+ protected InfoHeader infoHeader;
+ protected Bitmap image;
+
+ /**
+ * Creates a new instance of BMPImage
+ *
+ * @param image the decoded image
+ * @param infoHeader the InfoHeader structure providing information about the source encoded image
+ */
+ public BMPImage(Bitmap image, InfoHeader infoHeader) {
+ this.image = image;
+ this.infoHeader = infoHeader;
+ }
+
+ /**
+ * The InfoHeader structure representing the encoded BMP image.
+ */
+ public InfoHeader getInfoHeader() {
+ return infoHeader;
+ }
+
+ /**
+ * Sets the InfoHeader structure used for encoding the BMP image.
+ */
+ public void setInfoHeader(InfoHeader infoHeader) {
+ this.infoHeader = infoHeader;
+ }
+
+ /**
+ * The decoded BMP image.
+ */
+ public Bitmap getImage() {
+ return image;
+ }
+
+ /**
+ * Sets the image to be encoded.
+ */
+ public void setImage(Bitmap image) {
+ this.image = image;
+ }
+
+ /**
+ * The width of the BMP image in pixels.
+ *
+ * @return the width of the BMP image, or -1 if unknown
+ * @since 0.7alpha2
+ */
+ public int getWidth() {
+ return infoHeader == null ? -1 : infoHeader.iWidth;
+ }
+
+ /**
+ * The height of the BMP image in pixels.
+ *
+ * @return the height of the BMP image, or -1 if unknown.
+ * @since 0.7alpha2
+ */
+ public int getHeight() {
+ return infoHeader == null ? -1 : infoHeader.iHeight;
+ }
+
+ /**
+ * The colour depth of the BMP image (bits per pixel).
+ *
+ * @return the colour depth, or -1 if unknown.
+ * @since 0.7alpha2
+ */
+ public int getColourDepth() {
+ return infoHeader == null ? -1 : infoHeader.sBitCount;
+ }
+
+ /**
+ * The number of possible colours for the BMP image.
+ *
+ * @return the number of colours, or -1 if unknown.
+ * @since 0.7alpha2
+ */
+ public int getColourCount() {
+ int bpp = infoHeader.sBitCount == 32 ? 24 : infoHeader.sBitCount;
+ return bpp == -1 ? -1 : 1 << bpp;
+ }
+
+ /**
+ * Specifies whether this BMP image is indexed, that is, the encoded bitmap uses a colour table.
+ * If getColourDepth() returns -1, the return value has no meaning.
+ *
+ * @return true if indexed, false if not.
+ * @since 0.7alpha2
+ */
+ public boolean isIndexed() {
+ return infoHeader == null ? false : infoHeader.sBitCount <= 8;
+ }
+}
diff --git a/ico4a/src/main/java/divstar/ico4a/codec/bmp/ColorEntry.java b/ico4a/src/main/java/divstar/ico4a/codec/bmp/ColorEntry.java
new file mode 100644
index 000000000..321b94293
--- /dev/null
+++ b/ico4a/src/main/java/divstar/ico4a/codec/bmp/ColorEntry.java
@@ -0,0 +1,68 @@
+package divstar.ico4a.codec.bmp;
+
+import java.io.IOException;
+
+import divstar.ico4a.io.LittleEndianInputStream;
+
+/**
+ * Represents an RGB colour entry used in the palette of an indexed image (colour depth <= 8).
+ *
+ * @author Ian McDonagh
+ */
+public class ColorEntry {
+
+ /**
+ * The red component, which should be in the range 0..255.
+ */
+ public int bRed;
+ /**
+ * The green component, which should be in the range 0..255.
+ */
+ public int bGreen;
+ /**
+ * The blue component, which should be in the range 0..255.
+ */
+ public int bBlue;
+ /**
+ * Unused.
+ */
+ public int bReserved;
+
+ /**
+ * Reads and creates a colour entry from the source input.
+ *
+ * @param in the source input
+ * @throws IOException if an error occurs
+ */
+ public ColorEntry(LittleEndianInputStream in) throws IOException {
+ bBlue = in.readUnsignedByte();
+ bGreen = in.readUnsignedByte();
+ bRed = in.readUnsignedByte();
+ bReserved = in.readUnsignedByte();
+ }
+
+ /**
+ * Creates a colour entry with colour components initialized to 0.
+ */
+ public ColorEntry() {
+ bBlue = 0;
+ bGreen = 0;
+ bRed = 0;
+ bReserved = 0;
+ }
+
+ /**
+ * Creates a colour entry with the specified colour components.
+ *
+ * @param r red component
+ * @param g green component
+ * @param b blue component
+ * @param a unused
+ */
+ public ColorEntry(int r, int g, int b, int a) {
+ bBlue = b;
+ bGreen = g;
+ bRed = r;
+ bReserved = a;
+ }
+}
\ No newline at end of file
diff --git a/ico4a/src/main/java/divstar/ico4a/codec/bmp/InfoHeader.java b/ico4a/src/main/java/divstar/ico4a/codec/bmp/InfoHeader.java
new file mode 100644
index 000000000..f60f82c11
--- /dev/null
+++ b/ico4a/src/main/java/divstar/ico4a/codec/bmp/InfoHeader.java
@@ -0,0 +1,174 @@
+/*
+ * InfoHeader.java
+ *
+ * Created on 10 May 2006, 08:10
+ *
+ * To change this template, choose Tools | Template Manager
+ * and open the template in the editor.
+ */
+
+package divstar.ico4a.codec.bmp;
+
+import java.io.IOException;
+import java.util.Locale;
+
+import divstar.ico4a.io.LittleEndianInputStream;
+
+/**
+ * Represents a bitmap InfoHeader structure, which provides header information.
+ *
+ * @author Ian McDonagh
+ * @author Igor Tykhyy
+ */
+public class InfoHeader {
+
+ /**
+ * The size of this InfoHeader structure in bytes.
+ */
+ public int iSize;
+ /**
+ * The width in pixels of the bitmap represented by this InfoHeader.
+ */
+ public int iWidth;
+ /**
+ * The height in pixels of the bitmap represented by this InfoHeader.
+ */
+ public int iHeight;
+ /**
+ * The number of planes, which should always be 1.
+ */
+ public short sPlanes;
+ /**
+ * The bit count, which represents the colour depth (bits per pixel).
+ * This should be either 1, 4, 8, 24 or 32.
+ */
+ public short sBitCount;
+ /**
+ * The compression type, which should be one of the following:
+ *
+ *
{@link BMPConstants#BI_RGB BI_RGB} - no compression