From f275da01997b2391279efcacc6c1cf4695fab8b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= Date: Sun, 1 Jan 2023 23:33:25 +0100 Subject: [PATCH] Added GFX - support for TGA external images --- CHANGELOG.md | 3 + README.md | 2 + lib/tga.jar | Bin 0 -> 12995 bytes lib/tga.license.txt | 502 ++++++++++++++++++ libsrc/ffdec_lib/nbproject/project.xml | 2 +- .../decompiler/flash/gfx/TgaSupport.java | 37 ++ .../flash/tags/gfx/DefineExternalImage.java | 52 +- .../flash/tags/gfx/DefineExternalImage2.java | 94 ++-- 8 files changed, 635 insertions(+), 57 deletions(-) create mode 100644 lib/tga.jar create mode 100644 lib/tga.license.txt create mode 100644 libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/gfx/TgaSupport.java diff --git a/CHANGELOG.md b/CHANGELOG.md index c819939c1..05f657f6b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,9 @@ All notable changes to this project will be documented in this file. ## [Unreleased] +### Added +- GFX - support for TGA external images + ### Fixed - GFX - DefineExternalImage2 display and correct handling if standalone diff --git a/README.md b/README.md index cfc2b5760..8ac57db4c 100644 --- a/README.md +++ b/README.md @@ -179,6 +179,7 @@ And also links to these libraries: * [gnujpdf] (PDF export) - LGPL License * [DDSReader] (DDS reading) - MIT License * [vlcj] (DefineVideoStream playback) - GPLv3 +* [Reality Interactive ImageIO TGA library] (TGA file display in GFX files) - LGPL v2.1 [GIT]: http://git-scm.com/downloads [Netbeans IDE]: http://www.netbeans.org/ @@ -207,3 +208,4 @@ And also links to these libraries: [gnujpdf]: http://gnujpdf.sourceforge.net/ [DDSReader]: https://github.com/npedotnet/DDSReader/ [vlcj]: https://github.com/caprica/vlcj +[Reality Interactive ImageIO TGA library]: https://github.com/tmyroadctfig/com.realityinteractive.imageio.tga \ No newline at end of file diff --git a/lib/tga.jar b/lib/tga.jar new file mode 100644 index 0000000000000000000000000000000000000000..00e7663196730147f21cb772921abfb4ddeb8ee4 GIT binary patch literal 12995 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 WAbxelARzF+UN^t6mR7popZ*Vkv(kV7 literal 0 HcmV?d00001 diff --git a/lib/tga.license.txt b/lib/tga.license.txt new file mode 100644 index 000000000..4362b4915 --- /dev/null +++ b/lib/tga.license.txt @@ -0,0 +1,502 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! diff --git a/libsrc/ffdec_lib/nbproject/project.xml b/libsrc/ffdec_lib/nbproject/project.xml index 8068673cf..6f620dde5 100644 --- a/libsrc/ffdec_lib/nbproject/project.xml +++ b/libsrc/ffdec_lib/nbproject/project.xml @@ -239,7 +239,7 @@ auxiliary.show.customizer.message= src - ../../lib/LZMA.jar;../../lib/avi.jar;../../lib/gif.jar;../../lib/gnujpdf.jar;../../lib/jpacker.jar;../../lib/nellymoser.jar;../../lib/sfntly.jar;../../lib/ttf.jar;../../lib/cmykjpeg.jar;../../src;../../lib/flashdebugger.jar;../../lib/graphs.jar;../../lib/ddsreader.jar;../../lib/vlcj-4.7.3.jar;../../lib/jna-3.5.1.jar;../../lib/jna-platform-3.5.1.jar;../../lib/jlayer-1.0.2.jar + ../../lib/LZMA.jar;../../lib/avi.jar;../../lib/gif.jar;../../lib/gnujpdf.jar;../../lib/jpacker.jar;../../lib/nellymoser.jar;../../lib/sfntly.jar;../../lib/ttf.jar;../../lib/cmykjpeg.jar;../../src;../../lib/flashdebugger.jar;../../lib/graphs.jar;../../lib/ddsreader.jar;../../lib/vlcj-4.7.3.jar;../../lib/jna-3.5.1.jar;../../lib/jna-platform-3.5.1.jar;../../lib/jlayer-1.0.2.jar;../../lib/tga.jar build reports dist diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/gfx/TgaSupport.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/gfx/TgaSupport.java new file mode 100644 index 000000000..c6c2b81a4 --- /dev/null +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/gfx/TgaSupport.java @@ -0,0 +1,37 @@ +/* + * Copyright (C) 2010-2022 JPEXS, All rights reserved. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3.0 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. + */ +package com.jpexs.decompiler.flash.gfx; + +import javax.imageio.spi.IIORegistry; + +/** + * + * @author JPEXS + */ +public class TgaSupport { + + private static boolean inited = false; + + public static void init() { + if (inited) { + return; + } + IIORegistry registry = IIORegistry.getDefaultInstance(); + registry.registerServiceProvider(new com.realityinteractive.imageio.tga.TGAImageReaderSpi()); + inited = true; + } +} diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/gfx/DefineExternalImage.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/gfx/DefineExternalImage.java index 8264a1448..e1840eb23 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/gfx/DefineExternalImage.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/gfx/DefineExternalImage.java @@ -19,6 +19,7 @@ package com.jpexs.decompiler.flash.tags.gfx; import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.SWFInputStream; import com.jpexs.decompiler.flash.SWFOutputStream; +import com.jpexs.decompiler.flash.gfx.TgaSupport; import com.jpexs.decompiler.flash.helpers.ImageHelper; import com.jpexs.decompiler.flash.tags.base.ImageTag; import com.jpexs.decompiler.flash.tags.enums.ImageFormat; @@ -35,6 +36,7 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.util.Objects; +import javax.imageio.ImageIO; import net.npe.dds.DDSReader; /** @@ -175,30 +177,44 @@ public class DefineExternalImage extends ImageTag { } if (bitmapFormat == BITMAP_FORMAT_TGA) { - createFailedImage(); - return; - } - - Path imagePath = getSwf().getFile() == null ? null : Paths.get(getSwf().getFile()).getParent().resolve(Paths.get(fileName)); - if (imagePath != null && imagePath.toFile().exists()) { - try { - byte[] imageData = Files.readAllBytes(imagePath); - int[] pixels = DDSReader.read(imageData, DDSReader.ARGB, 0); - BufferedImage bufImage = new BufferedImage(DDSReader.getWidth(imageData), DDSReader.getHeight(imageData), BufferedImage.TYPE_INT_ARGB); - bufImage.getRaster().setDataElements(0, 0, bufImage.getWidth(), bufImage.getHeight(), pixels); - Image scaled = bufImage.getScaledInstance(targetWidth, targetHeight, Image.SCALE_DEFAULT); - bufImage = new BufferedImage(targetWidth, targetHeight, BufferedImage.TYPE_INT_ARGB); - bufImage.getGraphics().drawImage(scaled, 0, 0, null); - serImage = new SerializableImage(bufImage); - } catch (IOException ex) { + Path imagePath = getSwf().getFile() == null ? null : Paths.get(getSwf().getFile()).getParent().resolve(Paths.get(fileName)); + if (imagePath != null && imagePath.toFile().exists()) { + try { + TgaSupport.init(); + BufferedImage bufImage = ImageIO.read(imagePath.toFile()); + Image scaled = bufImage.getScaledInstance(targetWidth, targetHeight, Image.SCALE_DEFAULT); + bufImage = new BufferedImage(targetWidth, targetHeight, BufferedImage.TYPE_INT_ARGB); + bufImage.getGraphics().drawImage(scaled, 0, 0, null); + serImage = new SerializableImage(bufImage); + cachedImageFilename = fileName; + } catch (IOException ex) { + createFailedImage(); + } + } else { createFailedImage(); } } else { - createFailedImage(); + Path imagePath = getSwf().getFile() == null ? null : Paths.get(getSwf().getFile()).getParent().resolve(Paths.get(fileName)); + if (imagePath != null && imagePath.toFile().exists()) { + try { + byte[] imageData = Files.readAllBytes(imagePath); + int[] pixels = DDSReader.read(imageData, DDSReader.ARGB, 0); + BufferedImage bufImage = new BufferedImage(DDSReader.getWidth(imageData), DDSReader.getHeight(imageData), BufferedImage.TYPE_INT_ARGB); + bufImage.getRaster().setDataElements(0, 0, bufImage.getWidth(), bufImage.getHeight(), pixels); + Image scaled = bufImage.getScaledInstance(targetWidth, targetHeight, Image.SCALE_DEFAULT); + bufImage = new BufferedImage(targetWidth, targetHeight, BufferedImage.TYPE_INT_ARGB); + bufImage.getGraphics().drawImage(scaled, 0, 0, null); + serImage = new SerializableImage(bufImage); + } catch (IOException ex) { + createFailedImage(); + } + } else { + createFailedImage(); + } } } } - + @Override public boolean importSupported() { return false; diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/gfx/DefineExternalImage2.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/gfx/DefineExternalImage2.java index 7ef7fe0ba..3db7e6535 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/gfx/DefineExternalImage2.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/gfx/DefineExternalImage2.java @@ -19,6 +19,7 @@ package com.jpexs.decompiler.flash.tags.gfx; import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.SWFInputStream; import com.jpexs.decompiler.flash.SWFOutputStream; +import com.jpexs.decompiler.flash.gfx.TgaSupport; import com.jpexs.decompiler.flash.helpers.ImageHelper; import com.jpexs.decompiler.flash.tags.base.ImageTag; import com.jpexs.decompiler.flash.tags.enums.ImageFormat; @@ -35,6 +36,7 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.util.Objects; +import javax.imageio.ImageIO; import net.npe.dds.DDSReader; /** @@ -48,15 +50,15 @@ public class DefineExternalImage2 extends ImageTag { public static final String NAME = "DefineExternalImage2"; public int imageID; - + public static final int UNKNOWN_IS_STANDALONE = 0; public static final int UNKNOWN_HAS_SUBIMAGES = 9; - + /** - * Special unknown field. - * This seems to have value of 9 when it has DefineSubImages and in this case, - * imageId is not treated as a characterId. - * If it has value of 0, this tag is threated as standalone external image - standard character. + * Special unknown field. This seems to have value of 9 when it has + * DefineSubImages and in this case, imageId is not treated as a + * characterId. If it has value of 0, this tag is threated as standalone + * external image - standard character. */ public int unknownID; @@ -71,17 +73,17 @@ public class DefineExternalImage2 extends ImageTag { public String fileName; public byte[] extraData; //? - + public static final int BITMAP_FORMAT_DEFAULT = 0; - + public static final int BITMAP_FORMAT_TGA = 1; public static final int BITMAP_FORMAT_DDS = 2; - + //It looks like gfxexport produces BITMAP_FORMAT2_* values for format, //but BITMAP_FORMAT_* works the same way public static final int BITMAP_FORMAT2_JPEG = 10; - + public static final int BITMAP_FORMAT2_TGA = 13; public static final int BITMAP_FORMAT2_DDS = 14; @@ -91,7 +93,7 @@ public class DefineExternalImage2 extends ImageTag { @HideInRawEdit private String cachedImageFilename = null; - + /** * Gets data bytes * @@ -132,7 +134,7 @@ public class DefineExternalImage2 extends ImageTag { targetWidth = 1; targetHeight = 1; unknownID = UNKNOWN_HAS_SUBIMAGES; - bitmapFormat = BITMAP_FORMAT_DDS; + bitmapFormat = BITMAP_FORMAT2_DDS; characterID = -1; createFailedImage(); } @@ -140,7 +142,7 @@ public class DefineExternalImage2 extends ImageTag { @Override public final void readData(SWFInputStream sis, ByteArrayRange data, int level, boolean parallel, boolean skipUnusualTags, boolean lazy) throws IOException { imageID = sis.readUI16("imageID"); - unknownID = sis.readUI16("unknownID"); // always 9 + unknownID = sis.readUI16("unknownID"); bitmapFormat = sis.readUI16("bitmapFormat"); targetWidth = sis.readUI16("targetWidth"); targetHeight = sis.readUI16("targetHeight"); @@ -204,27 +206,43 @@ public class DefineExternalImage2 extends ImageTag { if (targetWidth <= 0 || targetHeight <= 0) { serImage = new SerializableImage(1, 1, BufferedImage.TYPE_4BYTE_ABGR_PRE); - serImage.fillTransparent(); - return; - } - - if (bitmapFormat == BITMAP_FORMAT_TGA) { - createFailedImage(); - return; - } - Path imagePath = getSwf().getFile() == null ? null : Paths.get(getSwf().getFile()).getParent().resolve(Paths.get(fileName)); - if (imagePath != null && imagePath.toFile().exists()) { - try { - byte[] imageData = Files.readAllBytes(imagePath); - int[] pixels = DDSReader.read(imageData, DDSReader.ARGB, 0); - BufferedImage bufImage = new BufferedImage(DDSReader.getWidth(imageData), DDSReader.getHeight(imageData), BufferedImage.TYPE_INT_ARGB); - bufImage.getRaster().setDataElements(0, 0, bufImage.getWidth(), bufImage.getHeight(), pixels); - Image scaled = bufImage.getScaledInstance(targetWidth, targetHeight, Image.SCALE_DEFAULT); - bufImage = new BufferedImage(targetWidth, targetHeight, BufferedImage.TYPE_INT_ARGB); - bufImage.getGraphics().drawImage(scaled, 0, 0, null); - serImage = new SerializableImage(bufImage); - cachedImageFilename = fileName; - } catch (IOException ex) { + serImage.fillTransparent(); + } else if (bitmapFormat == BITMAP_FORMAT2_JPEG || bitmapFormat == BITMAP_FORMAT2_TGA || bitmapFormat == BITMAP_FORMAT_TGA) { + Path imagePath = getSwf().getFile() == null ? null : Paths.get(getSwf().getFile()).getParent().resolve(Paths.get(fileName)); + if (imagePath != null && imagePath.toFile().exists()) { + try { + if (bitmapFormat == BITMAP_FORMAT2_TGA || bitmapFormat == BITMAP_FORMAT_TGA) { + TgaSupport.init(); + } + BufferedImage bufImage = ImageIO.read(imagePath.toFile()); + Image scaled = bufImage.getScaledInstance(targetWidth, targetHeight, Image.SCALE_DEFAULT); + bufImage = new BufferedImage(targetWidth, targetHeight, BufferedImage.TYPE_INT_ARGB); + bufImage.getGraphics().drawImage(scaled, 0, 0, null); + serImage = new SerializableImage(bufImage); + cachedImageFilename = fileName; + } catch (IOException ex) { + createFailedImage(); + } + } else { + createFailedImage(); + } + } else if (bitmapFormat == BITMAP_FORMAT2_DDS || bitmapFormat == BITMAP_FORMAT2_DDS) { + Path imagePath = getSwf().getFile() == null ? null : Paths.get(getSwf().getFile()).getParent().resolve(Paths.get(fileName)); + if (imagePath != null && imagePath.toFile().exists()) { + try { + byte[] imageData = Files.readAllBytes(imagePath); + int[] pixels = DDSReader.read(imageData, DDSReader.ARGB, 0); + BufferedImage bufImage = new BufferedImage(DDSReader.getWidth(imageData), DDSReader.getHeight(imageData), BufferedImage.TYPE_INT_ARGB); + bufImage.getRaster().setDataElements(0, 0, bufImage.getWidth(), bufImage.getHeight(), pixels); + Image scaled = bufImage.getScaledInstance(targetWidth, targetHeight, Image.SCALE_DEFAULT); + bufImage = new BufferedImage(targetWidth, targetHeight, BufferedImage.TYPE_INT_ARGB); + bufImage.getGraphics().drawImage(scaled, 0, 0, null); + serImage = new SerializableImage(bufImage); + cachedImageFilename = fileName; + } catch (IOException ex) { + createFailedImage(); + } + } else { createFailedImage(); } } else { @@ -232,7 +250,7 @@ public class DefineExternalImage2 extends ImageTag { } } } - + @Override public boolean importSupported() { return false; @@ -244,10 +262,10 @@ public class DefineExternalImage2 extends ImageTag { return super.toString(); } return tagName + " (i" + imageID + ")"; - } + } @Override public void setCharacterId(int characterId) { - - } + + } }