diff --git a/CHANGELOG.md b/CHANGELOG.md index 0945c949d..c68809417 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 +- [#1029] Better separation of library and main app, dependencies inside library zip, library readme + ### Fixed - [#1948] Timeout while deobfuscation did not skip method - [#1948] NullPointerException on Simplify expressions on incrementent/decrement @@ -2911,6 +2914,7 @@ All notable changes to this project will be documented in this file. [alpha 7]: https://github.com/jindrapetrik/jpexs-decompiler/releases/tag/alpha7 [#1948]: https://www.free-decompiler.com/flash/issues/1948 [#1941]: https://www.free-decompiler.com/flash/issues/1941 +[#1029]: https://www.free-decompiler.com/flash/issues/1029 [#1913]: https://www.free-decompiler.com/flash/issues/1913 [#1888]: https://www.free-decompiler.com/flash/issues/1888 [#1894]: https://www.free-decompiler.com/flash/issues/1894 diff --git a/README.md b/README.md index 8ac57db4c..6eb271610 100644 --- a/README.md +++ b/README.md @@ -158,28 +158,9 @@ And links also these libraries: * FFDec Library (LGPLv3) - see below Application uses also some icons of the [Silk icons pack], [Silk companion 1], [FatCow icons pack] and [Aha-Soft icons pack]. -### Library -FFDec Library is licensed under GNU LGPL v3 (LGPL-3.0-or-later), see [license.txt](libsrc/ffdec_lib/license.txt) for details. -It uses modified code of these libraries: - -* [sfntly] (WOFF font export) - Apache License 2.0 -* [JLayer] (Decoding MP3) - LGPL -* UAB "DKD" NellyMoser ASAO codec (Decoding Nelly Moser sound format) - LGPL -* [Animated GIF Writer] (Frames to GIF export) - Creative Commons Attribution 3.0 Unported -* [Animated GIF Encoder] (Frames to GIF export) - -And also links to these libraries: - -* [LZMA SDK] (SWF de/compress) - public domain -* [Monte Media Library] (Frames to AVI export) - LGPL -* [Fontastic] (Font TTF export) - LGPL -* [DoubleType] (Font TTF export) - GPLv2 -* [jPacker] (Canvas scripts compression) - MIT License -* [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 +## Library +See [library README](libsrc/ffdec_lib/README.md) for more info about FFDec library. [GIT]: http://git-scm.com/downloads [Netbeans IDE]: http://www.netbeans.org/ @@ -195,17 +176,4 @@ And also links to these libraries: [Silk icons pack]: http://www.famfamfam.com/lab/icons/silk/ [Silk companion 1]: http://damieng.com/creative/icons/silk-companion-1-icons [FatCow icons pack]: http://www.fatcow.com/free-icons -[Aha-Soft icons pack]: http://www.aha-soft.com -[sfntly]: https://code.google.com/p/sfntly/ -[JLayer]: http://www.javazoom.net/javalayer/javalayer.html -[Animated GIF Writer]: http://elliot.kroo.net/software/java/GifSequenceWriter/ -[Animated GIF Encoder]: http://www.fmsware.com/stuff/gif.html -[LZMA SDK]: http://www.7-zip.org/sdk.html -[Monte Media Library]: http://www.randelshofer.ch/monte/ -[Fontastic]: http://code.andreaskoller.com/libraries/fontastic/ -[DoubleType]: http://sourceforge.net/projects/doubletype/ -[jPacker]: https://code.google.com/p/jpacker/ -[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 +[Aha-Soft icons pack]: http://www.aha-soft.com \ No newline at end of file diff --git a/lib/graphs.jar b/lib/graphs.jar deleted file mode 100644 index 8d3a86ff0..000000000 Binary files a/lib/graphs.jar and /dev/null differ diff --git a/libsrc/ffdec_lib/README.md b/libsrc/ffdec_lib/README.md new file mode 100644 index 000000000..a194790d4 --- /dev/null +++ b/libsrc/ffdec_lib/README.md @@ -0,0 +1,183 @@ +# JPEXS Free Flash Decompiler Library + +Open Source Flash SWF decompiler and editor library. + +## Main application +For information about main application, see [Main project](https://github.com/jindrapetrik/jpexs-decompiler) + +## Library JAR file +Main FFDec library JAR file is named `ffdec_lib.jar`. + +## Dependencies +Some of the library features require additional library files. + +These include: + +* CMYKJPEG - `cmykjpeg.jar` - CMYK JPEG image support +* sfntly - `sfntly.jar` - WOFF font export +* JLayer - `jlayer-1.0.2.jar` - Decoding MP3 +* UAB "DKD" NellyMoser ASAO codec - `nellymoser.jar` - Decoding Nelly Moser sound format +* Animated GIF Writer/Encoder - `gif.jar` +* LZMA SDK - `LZMA.jar` - Reading SWF compressed with LZMA +* Monte Media Library - `avi.jar` - Frames to AVI export +* Fontastic, DoubleType - `ttf.jar` - Font TTF export +* jPacker - `jpacker.jar` - HTML Canvas export scripts compression +* gnujpdf - `gnujpdf.jar` - PDF export +* vlcj - `vlcj-4.7.3.jar`, `vlcj-natives-4.7.0.jar` - Display/Export of video tags +* DDSReader - `ddsreader.jar` - DDS images reading (GFX files) +* Reality Interactive ImageIO TGA library - `tga.jar` - TGA images reading (GFX files) +* Flashdebugger library - `flashdebugger.jar` - Flash debugging + +## Basic library usage +```java +package com.jpexs.decompiler.flash.test; + +import com.jpexs.decompiler.flash.SWF; +import com.jpexs.decompiler.flash.SwfOpenException; +import com.jpexs.decompiler.flash.tags.Tag; +import com.jpexs.decompiler.flash.tags.base.CharacterIdTag; +import java.io.FileInputStream; +import java.io.IOException; + +public class Test { + public static void main(String[] args) { + try ( FileInputStream fis = new FileInputStream("data/as3.swf")) { //open up a file + + //Pass the InputStream to SWF constructor. + //Note: There are many variants of the constructor - Do not use single parameter version - it does not process whole SWF. + SWF swf = new SWF(fis, true); + + //Get some SWF parameters + System.out.println("SWF version = " + swf.version); + System.out.println("FrameCount = " + swf.frameCount); + + //Process all tags + for (Tag t : swf.getTags()) { + if (t instanceof CharacterIdTag) { //Print character id with the tag if it has any + System.out.println("Tag " + t.getTagName() + " (" + ((CharacterIdTag) t).getCharacterId() + ")"); + } else { + System.out.println("Tag " + t.getTagName()); + } + } + + System.out.println("OK"); + } catch (SwfOpenException ex) { + System.out.println("ERROR: Invalid SWF file"); + } catch (IOException ex) { + System.out.println("ERROR: Error during SWF opening"); + } catch (InterruptedException ex) { + System.out.println("ERROR: Parsing interrupted"); + } + } +} +``` + +## SWF modification +```java +import com.jpexs.decompiler.flash.tags.base.PlaceObjectTypeTag; +import com.jpexs.decompiler.flash.types.MATRIX; + ... + SWF swf = new SWF(fis, true); + for (Tag t : swf.getTags()) { + if (t instanceof PlaceObjectTypeTag) { //Find all PlaceObject(1,2,3,4) tags + PlaceObjectTypeTag po = (PlaceObjectTypeTag)t; + MATRIX mat = po.getMatrix(); + if (mat != null) { + mat.translateX += 2000; //move 100 pixels to right + } + po.setModified(true); //CRUCIAL to call on every modified tag, otherwise it won't save + } + } + + OutputStream os = new FileOutputStream("data/file_modified.swf"); + try { + swf.saveTo(os); + } catch (IOException e) { + System.out.println("ERROR: Error during SWF saving"); + } +... +``` + +## Usefull packages and classes +### `com.jpexs.decompiler.flash` - SWF reading and writing +* `SWF` - Basic class for SWF manipulation +* `SWFInputStream` - Reading of SWF data +* `SWFOuputStream` - Writing of SWF data + +### `com.jpexs.decompiler.flash.abc` - AS3 bytecode (ABC format) +* `ABC` - AS3 bytecode structure +* `ABCInputStream` - Reading AS3 bytecode structure +* `ABCOutputStream` - Writing AS3 bytecode structure +* `ScriptPack` - **important** - for purposes of easily displaying of flashCC/alchemy long scripts, ABC scripts can be splitted into so called `script packs` which is script index and list of trait indices. FFDec always displays a scriptpack, not a whole script. + +### `com.jpexs.decompiler.flash.abc.avm2` - AS3 AVM2 code +* `AVM2Code` - code handling +### `com.jpexs.decompiler.flash.abc.avm2.deobfuscation` - Some AS3 AVM2 code deobfuscation classes +### `com.jpexs.decompiler.flash.abc.avm2.graph` - Generates high-level code from instructions of AVM2 code +### `com.jpexs.decompiler.flash.abc.avm2.instructions.*` - Instructions for AS3 AVM2 code +### `com.jpexs.decompiler.flash.abc.avm2.model.*` - Model representing generated high-level code of AS3 +### `com.jpexs.decompiler.flash.abc.avm2.parser.*` - Compilers of AS3 and its p-code +### `com.jpexs.decompiler.flash.abc.types` - ABC format related types +### `com.jpexs.decompiler.flash.abc.types.traits` - ABC traits +### `com.jpexs.decompiler.flash.abc.usages` - Get usages feature +### `com.jpexs.decompiler.flash.action` - AS1/2 related +### `com.jpexs.decompiler.flash.action.swf*` - AS1/2 Actions +### `com.jpexs.decompiler.flash.action.model` - Model representing generated high-level code of AS1/2 +### `com.jpexs.decompiler.flash.action.parser.*` - Compilers of A1/2 and its p-code +### `com.jpexs.decompiler.flash.configuration` - Configuration of the decompilation +### `com.jpexs.decompiler.flash.exporters` - Exporters of resources/scripts to various formats +### `com.jpexs.decompiler.flash.iggy` - Iggy format related +### `com.jpexs.decompiler.flash.importers` - Importers of resources/scripts from various formats +### `com.jpexs.decompiler.flash.tags` - Definitions of SWF tags +### `com.jpexs.decompiler.flash.timeline` - Browsing SWF in a timeline +### `com.jpexs.decompiler.flash.types` - Structures used in SWF file +### `com.jpexs.decompiler.flash.xfl` - Export to FLA and XFL +### `com.jpexs.decompiler.flash.graph` - Generates high-level code from instructions of AS1/2/3 code +### `com.jpexs.decompiler.flash.graph.model.*` - Shared model representing generated high-level code + + +## Authors and contact +The decompiler was originally written by **Jindra Petřík** also known as **JPEXS**. +The application was made in Czech Republic. +See more info on [main project website](https://github.com/jindrapetrik/jpexs-decompiler/) + + +## Licenses + Acknowledgments +FFDec Library is licensed under GNU LGPL v3 (LGPL-3.0-or-later), see [license.txt](license.txt) for details. +It uses modified code of these libraries: + +* [sfntly] (WOFF font export) - Apache License 2.0 +* [JLayer] (Decoding MP3) - LGPL +* UAB "DKD" NellyMoser ASAO codec (Decoding Nelly Moser sound format) - LGPL +* [Animated GIF Writer] (Frames to GIF export) - Creative Commons Attribution 3.0 Unported +* [Animated GIF Encoder] (Frames to GIF export) +* [gnujpdf] (PDF export) - LGPL License + +And also links to these libraries: + +* [LZMA SDK] (SWF de/compress) - public domain +* [Monte Media Library] (Frames to AVI export) - LGPL +* [Fontastic] (Font TTF export) - LGPL +* [DoubleType] (Font TTF export) - GPLv2 +* [jPacker] (Canvas scripts compression) - MIT License +* [DDSReader] (DDS reading) - MIT License +* [vlcj] (DefineVideoStream playback) - GPLv3 +* [Reality Interactive ImageIO TGA library] (TGA file display in GFX files) - LGPL v2.1 +* [flashdebugger library] (Debugging ActionScript) - LGPLv3 +* [Java Native Access - JNA] (Registry association, Process memory reading) - LGPL + +[sfntly]: https://code.google.com/p/sfntly/ +[JLayer]: http://www.javazoom.net/javalayer/javalayer.html +[Animated GIF Writer]: http://elliot.kroo.net/software/java/GifSequenceWriter/ +[Animated GIF Encoder]: http://www.fmsware.com/stuff/gif.html +[LZMA SDK]: http://www.7-zip.org/sdk.html +[Monte Media Library]: http://www.randelshofer.ch/monte/ +[Fontastic]: http://code.andreaskoller.com/libraries/fontastic/ +[DoubleType]: http://sourceforge.net/projects/doubletype/ +[jPacker]: https://code.google.com/p/jpacker/ +[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 +[flashdebugger library]: https://github.com/jindrapetrik/flashdebugger +[Java Native Access - JNA]: https://github.com/twall/jna \ No newline at end of file diff --git a/libsrc/ffdec_lib/build.properties b/libsrc/ffdec_lib/build.properties index ab0ee1a8d..d80e37566 100644 --- a/libsrc/ffdec_lib/build.properties +++ b/libsrc/ffdec_lib/build.properties @@ -15,6 +15,7 @@ compile.dir = build/classes coverage.dir = coverage compile.test.dir = build/test lib.dir = ../../lib +liblib.dir = lib releases.dir = releases properties.name = project.properties dist.lib.dirname = lib @@ -24,5 +25,6 @@ ant.lib.dir = antlib version_info = version.properties changelog.file = CHANGELOG.md +readme.file = README.md license.file = license.txt gui.changelog.file = ../../CHANGELOG.md diff --git a/libsrc/ffdec_lib/build.xml b/libsrc/ffdec_lib/build.xml index aafc4d311..6d346827f 100644 --- a/libsrc/ffdec_lib/build.xml +++ b/libsrc/ffdec_lib/build.xml @@ -41,7 +41,12 @@ - + + + + + + @@ -244,7 +249,9 @@ - + + + diff --git a/libsrc/ffdec_lib/lib/LZMA.jar b/libsrc/ffdec_lib/lib/LZMA.jar new file mode 100644 index 000000000..dc74d72be Binary files /dev/null and b/libsrc/ffdec_lib/lib/LZMA.jar differ diff --git a/libsrc/ffdec_lib/lib/avi.jar b/libsrc/ffdec_lib/lib/avi.jar new file mode 100644 index 000000000..740501fa0 Binary files /dev/null and b/libsrc/ffdec_lib/lib/avi.jar differ diff --git a/libsrc/ffdec_lib/lib/avi.montemedia.license.txt b/libsrc/ffdec_lib/lib/avi.montemedia.license.txt new file mode 100644 index 000000000..b10d67604 --- /dev/null +++ b/libsrc/ffdec_lib/lib/avi.montemedia.license.txt @@ -0,0 +1,8 @@ +Monte Media Library © 2012 +Werner Randelshofer, Hausmatt 10, CH-6405 Goldau Switzerland +werner.randelshofer@bluewin.ch +All Rights Reserved. + +The Monte Media Library can be licensed under the terms of the Creative Commons BY 3.0 license, and/or under the terms of the Lesser General Public License LGPL Version 3. + +The license is free for commercial and non-commercial use. \ No newline at end of file diff --git a/libsrc/ffdec_lib/lib/cmykjpeg.jar b/libsrc/ffdec_lib/lib/cmykjpeg.jar new file mode 100644 index 000000000..82cafaecc Binary files /dev/null and b/libsrc/ffdec_lib/lib/cmykjpeg.jar differ diff --git a/libsrc/ffdec_lib/lib/ddsreader.jar b/libsrc/ffdec_lib/lib/ddsreader.jar new file mode 100644 index 000000000..f5c6fbcca Binary files /dev/null and b/libsrc/ffdec_lib/lib/ddsreader.jar differ diff --git a/libsrc/ffdec_lib/lib/ddsreader.license b/libsrc/ffdec_lib/lib/ddsreader.license new file mode 100644 index 000000000..b150fc947 --- /dev/null +++ b/libsrc/ffdec_lib/lib/ddsreader.license @@ -0,0 +1,22 @@ +The MIT License (MIT) + +Copyright (c) 2015 Kenji Sasaki + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + diff --git a/libsrc/ffdec_lib/lib/flashdebugger.jar b/libsrc/ffdec_lib/lib/flashdebugger.jar new file mode 100644 index 000000000..84b21f3d5 Binary files /dev/null and b/libsrc/ffdec_lib/lib/flashdebugger.jar differ diff --git a/libsrc/ffdec_lib/lib/gif.jar b/libsrc/ffdec_lib/lib/gif.jar new file mode 100644 index 000000000..a9b48c437 Binary files /dev/null and b/libsrc/ffdec_lib/lib/gif.jar differ diff --git a/libsrc/ffdec_lib/lib/gif.license.txt b/libsrc/ffdec_lib/lib/gif.license.txt new file mode 100644 index 000000000..1febc60c3 --- /dev/null +++ b/libsrc/ffdec_lib/lib/gif.license.txt @@ -0,0 +1,6 @@ +Created by Elliot Kroo on 2009-04-25. + +This work is licensed under the Creative Commons Attribution 3.0 Unported +License. To view a copy of this license, visit +http://creativecommons.org/licenses/by/3.0/ or send a letter to Creative +Commons, 171 Second Street, Suite 300, San Francisco, California, 94105, USA. \ No newline at end of file diff --git a/libsrc/ffdec_lib/lib/gnujpdf.jar b/libsrc/ffdec_lib/lib/gnujpdf.jar new file mode 100644 index 000000000..56d18bbef Binary files /dev/null and b/libsrc/ffdec_lib/lib/gnujpdf.jar differ diff --git a/libsrc/ffdec_lib/lib/jlayer-1.0.2.jar b/libsrc/ffdec_lib/lib/jlayer-1.0.2.jar new file mode 100644 index 000000000..21d4188fc Binary files /dev/null and b/libsrc/ffdec_lib/lib/jlayer-1.0.2.jar differ diff --git a/libsrc/ffdec_lib/lib/jlayer.license.txt b/libsrc/ffdec_lib/lib/jlayer.license.txt new file mode 100644 index 000000000..ef8de92a6 --- /dev/null +++ b/libsrc/ffdec_lib/lib/jlayer.license.txt @@ -0,0 +1,17 @@ +Copyright (C) 1993, 1994 Tobias Bading (bading@cs.tu-berlin.de) +Berlin University of Technology +----------------------------------------------------------------------- +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU Library General Public License as published +by the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This 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 Library General Public License for more details. + +You should have received a copy of the GNU Library General Public +License along with this program; if not, write to the Free Software +Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +---------------------------------------------------------------------- \ No newline at end of file diff --git a/libsrc/ffdec_lib/lib/jna-3.5.1.jar b/libsrc/ffdec_lib/lib/jna-3.5.1.jar new file mode 100644 index 000000000..0827fcfa0 Binary files /dev/null and b/libsrc/ffdec_lib/lib/jna-3.5.1.jar differ diff --git a/libsrc/ffdec_lib/lib/jna-platform-3.5.1.jar b/libsrc/ffdec_lib/lib/jna-platform-3.5.1.jar new file mode 100644 index 000000000..7085b3141 Binary files /dev/null and b/libsrc/ffdec_lib/lib/jna-platform-3.5.1.jar differ diff --git a/libsrc/ffdec_lib/lib/jna.license.txt b/libsrc/ffdec_lib/lib/jna.license.txt new file mode 100644 index 000000000..0eb865e1b --- /dev/null +++ b/libsrc/ffdec_lib/lib/jna.license.txt @@ -0,0 +1,11 @@ +Copyright (c) 2007 Timothy Wall, 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 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. diff --git a/libsrc/ffdec_lib/lib/jpacker.jar b/libsrc/ffdec_lib/lib/jpacker.jar new file mode 100644 index 000000000..e5b208e54 Binary files /dev/null and b/libsrc/ffdec_lib/lib/jpacker.jar differ diff --git a/libsrc/ffdec_lib/lib/jpacker.license.txt b/libsrc/ffdec_lib/lib/jpacker.license.txt new file mode 100644 index 000000000..a08669cf8 --- /dev/null +++ b/libsrc/ffdec_lib/lib/jpacker.license.txt @@ -0,0 +1,10 @@ +Packer version 3.0 (final) +Copyright 2004-2007, Dean Edwards +Web: http://dean.edwards.name/ + +This software is licensed under the MIT license +Web: http://www.opensource.org/licenses/mit-license + +Ported to Java by Pablo Santiago based on C# version by Jesse Hansen, +Web: http://jpacker.googlecode.com/ +Email: pablo.santiago@gmail.com diff --git a/libsrc/ffdec_lib/lib/nellymoser.jar b/libsrc/ffdec_lib/lib/nellymoser.jar new file mode 100644 index 000000000..f89599dfb Binary files /dev/null and b/libsrc/ffdec_lib/lib/nellymoser.jar differ diff --git a/libsrc/ffdec_lib/lib/nellymoser.license.txt b/libsrc/ffdec_lib/lib/nellymoser.license.txt new file mode 100644 index 000000000..3ec3f1729 --- /dev/null +++ b/libsrc/ffdec_lib/lib/nellymoser.license.txt @@ -0,0 +1,17 @@ +NellyMoser ASAO codec +Copyright (C) 2007-2008 UAB "DKD" +Copyright (C) 2007-2008 Joseph Artsimovich + +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 FFmpeg; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA \ No newline at end of file diff --git a/libsrc/ffdec_lib/lib/sfntly.jar b/libsrc/ffdec_lib/lib/sfntly.jar new file mode 100644 index 000000000..27c35a56d Binary files /dev/null and b/libsrc/ffdec_lib/lib/sfntly.jar differ diff --git a/libsrc/ffdec_lib/lib/sfntly.license.txt b/libsrc/ffdec_lib/lib/sfntly.license.txt new file mode 100644 index 000000000..762937be3 --- /dev/null +++ b/libsrc/ffdec_lib/lib/sfntly.license.txt @@ -0,0 +1,13 @@ +Copyright 2010 Google Inc. All Rights Reserved. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. \ No newline at end of file diff --git a/libsrc/ffdec_lib/lib/tga.jar b/libsrc/ffdec_lib/lib/tga.jar new file mode 100644 index 000000000..00e766319 Binary files /dev/null and b/libsrc/ffdec_lib/lib/tga.jar differ diff --git a/libsrc/ffdec_lib/lib/tga.license.txt b/libsrc/ffdec_lib/lib/tga.license.txt new file mode 100644 index 000000000..4362b4915 --- /dev/null +++ b/libsrc/ffdec_lib/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/lib/ttf.doubletype.license.txt b/libsrc/ffdec_lib/lib/ttf.doubletype.license.txt new file mode 100644 index 000000000..126b8a2b2 --- /dev/null +++ b/libsrc/ffdec_lib/lib/ttf.doubletype.license.txt @@ -0,0 +1,24 @@ +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 2 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, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +In addition, as a special exception, e.e d3si9n gives permission to +link the code of this program with any Java Platform that is available +to public with free of charge, including but not limited to +Sun Microsystem's JAVA(TM) 2 RUNTIME ENVIRONMENT (J2RE), +and distribute linked combinations including the two. +You must obey the GNU General Public License in all respects for all +of the code used other than Java Platform. If you modify this file, +you may extend this exception to your version of the file, but you are not +obligated to do so. If you do not wish to do so, delete this exception +statement from your version. \ No newline at end of file diff --git a/libsrc/ffdec_lib/lib/ttf.fontastic.license.txt b/libsrc/ffdec_lib/lib/ttf.fontastic.license.txt new file mode 100644 index 000000000..79e0b766a --- /dev/null +++ b/libsrc/ffdec_lib/lib/ttf.fontastic.license.txt @@ -0,0 +1,20 @@ +Fontastic +A font file writer to create TTF and WOFF (Webfonts). +http://code.andreaskoller.com/libraries/fontastic + +Copyright (C) 2013 Andreas Koller http://andreaskoller.com + +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., 59 Temple Place, Suite 330, +Boston, MA 02111-1307 USA \ No newline at end of file diff --git a/libsrc/ffdec_lib/lib/ttf.jar b/libsrc/ffdec_lib/lib/ttf.jar new file mode 100644 index 000000000..89ebdee9c Binary files /dev/null and b/libsrc/ffdec_lib/lib/ttf.jar differ diff --git a/libsrc/ffdec_lib/lib/vlcj-4.7.3.jar b/libsrc/ffdec_lib/lib/vlcj-4.7.3.jar new file mode 100644 index 000000000..2575f7af8 Binary files /dev/null and b/libsrc/ffdec_lib/lib/vlcj-4.7.3.jar differ diff --git a/libsrc/ffdec_lib/lib/vlcj-natives-4.7.0.jar b/libsrc/ffdec_lib/lib/vlcj-natives-4.7.0.jar new file mode 100644 index 000000000..be7258d8f Binary files /dev/null and b/libsrc/ffdec_lib/lib/vlcj-natives-4.7.0.jar differ diff --git a/libsrc/ffdec_lib/nbproject/project.xml b/libsrc/ffdec_lib/nbproject/project.xml index 6f620dde5..c3c40440e 100644 --- a/libsrc/ffdec_lib/nbproject/project.xml +++ b/libsrc/ffdec_lib/nbproject/project.xml @@ -223,6 +223,9 @@ auxiliary.show.customizer.message= version.properties + + README.md + @@ -239,7 +242,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/tga.jar + ../../src;lib/LZMA.jar;lib/avi.jar;lib/cmykjpeg.jar;lib/ddsreader.jar;lib/gif.jar;lib/gnujpdf.jar;lib/jlayer-1.0.2.jar;lib/jpacker.jar;lib/nellymoser.jar;lib/sfntly.jar;lib/tga.jar;lib/ttf.jar;lib/vlcj-4.7.3.jar;lib/vlcj-natives-4.7.0.jar;lib/flashdebugger.jar;lib/jna-3.5.1.jar;lib/jna-platform-3.5.1.jar build reports dist diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/script/DotId.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/script/DotId.java new file mode 100644 index 000000000..149716858 --- /dev/null +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/script/DotId.java @@ -0,0 +1,159 @@ +/* + * 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.exporters.script; + +/** + * + * @author JPEXS + */ +import java.util.Arrays; +import java.util.Objects; +import java.util.regex.Pattern; + +/** + * + * @author JPEXS + */ +public final class DotId { + + final static String[] RESERVED_WORDS = new String[]{"node", "edge", "graph", "digraph", "subgraph", "strict"}; + final static Pattern RESERVED_PATTERN = Pattern.compile("^" + String.join("|", RESERVED_WORDS) + "$", Pattern.CASE_INSENSITIVE); + final static Pattern NUMERAL_PATTERN = Pattern.compile("^[-]?(.[0-9]+|[0-9]+(.[0-9]*)?)$"); + final static String IDENTIFIER_FIRST_CHARS = "a-zA-Z\\u0200-\\u0377_"; + final static String IDENTIFIER_NEXT_CHARS = IDENTIFIER_FIRST_CHARS + "0-9"; + final static String CH = "^[" + IDENTIFIER_FIRST_CHARS + "][" + IDENTIFIER_NEXT_CHARS + "]*$"; + final static Pattern IDENTIFIER_PATTERN = Pattern.compile(CH); + + private final String value; + private final boolean isHtml; + private final String toStringValue; + + public DotId(String value, boolean isHtml) { + this.value = value; + this.isHtml = isHtml; + this.toStringValue = generateToString(); + } + + @Override + public String toString() { + return toStringValue; + } + + private String generateToString() { + if (isHtml) { + return "<" + value + ">"; + } + if (RESERVED_PATTERN.matcher(value).matches()) { + return "\"" + value + "\""; + } + + if (NUMERAL_PATTERN.matcher(value).matches()) { + return value; + } + if (IDENTIFIER_PATTERN.matcher(value).matches()) { + return value; + } + return "\"" + value.replace("\"", "\\\"") + "\""; + } + + @Override + public int hashCode() { + int hash = 5; + hash = 89 * hash + Objects.hashCode(this.value); + hash = 89 * hash + (this.isHtml ? 1 : 0); + return hash; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (obj == null) { + return false; + } + if (getClass() != obj.getClass()) { + return false; + } + final DotId other = (DotId) obj; + if (this.isHtml != other.isHtml) { + return false; + } + if (!Objects.equals(this.value, other.value)) { + return false; + } + return true; + } + + public static DotId join(CharSequence delimiter, DotId... ids) { + return join(new DotId(delimiter.toString(), false), ids); + } + + public static DotId join(DotId delimiter, DotId... ids) { + return join(delimiter, Arrays.asList(ids)); + } + + public static DotId join(CharSequence delimiter, Iterable ids) { + return join(new DotId(delimiter.toString(), false), ids); + } + + public static DotId join(DotId delimiter, Iterable ids) { + StringBuilder sb = new StringBuilder(); + boolean retHtml = false; + + for (DotId id : ids) { + if (id.isHtml) { + retHtml = true; + } + } + DotId usedDelimiter = delimiter; + if (retHtml) { + usedDelimiter = usedDelimiter.toHtmlDotId(); + } + + boolean first = true; + for (DotId id : ids) { + if (!first) { + sb.append(usedDelimiter.value); + } + first = false; + DotId idToAppend = id; + if (retHtml) { + idToAppend = idToAppend.stripEndNewLine().toHtmlDotId(); + } + sb.append(idToAppend.value); + } + + return new DotId(sb.toString(), retHtml); + } + + private DotId stripEndNewLine() { + if (isHtml) { + return this; + } + return new DotId(value.replaceFirst("\\\\(r|n|l)$", ""), false); + } + + private DotId toHtmlDotId() { + if (isHtml) { + return this; + } + String htmlValue = value.replaceAll("\\\\(r|n|l)", "
"); + return new DotId(htmlValue, true); + } + +} \ No newline at end of file diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/script/PcodeGraphVizExporter.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/script/PcodeGraphVizExporter.java index ae544abfd..bb611f74e 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/script/PcodeGraphVizExporter.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/script/PcodeGraphVizExporter.java @@ -36,7 +36,6 @@ import com.jpexs.decompiler.graph.GraphException; import com.jpexs.decompiler.graph.GraphPart; import com.jpexs.decompiler.graph.GraphSource; import com.jpexs.decompiler.graph.ScopeStack; -import com.jpexs.graphs.graphviz.dot.parser.DotId; import com.jpexs.helpers.Helper; import com.jpexs.helpers.utf8.Utf8Helper; import java.io.IOException; diff --git a/nbproject/project.xml b/nbproject/project.xml index ce00f293b..45c328f1d 100644 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -282,6 +282,9 @@ nbproject/ide-targets.xml + + README.md + @@ -320,7 +323,7 @@ src - lib/LZMA.jar;lib/jpproxy.jar;lib/trident-6.2.jar;lib/substance-flamingo-6.2.jar;lib/flamingo-6.2.jar;lib/substance-6.2.jar;lib/nellymoser.jar;lib/gif.jar;lib/avi.jar;lib/ttf.jar;lib/jpacker.jar;lib/sfntly.jar;lib/gnujpdf.jar;libsrc/ffdec_lib/src;lib/tablelayout.jar;lib/jsyntaxpane-0.9.5.jar;lib/JavactiveX.jar;lib/flashdebugger.jar;lib/treetable.jar;lib/minimal-json-0.9.5.jar;lib/graphs.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/jpproxy.jar;lib/trident-6.2.jar;lib/substance-flamingo-6.2.jar;lib/flamingo-6.2.jar;lib/substance-6.2.jar;libsrc/ffdec_lib/src;lib/tablelayout.jar;lib/jsyntaxpane-0.9.5.jar;lib/JavactiveX.jar;lib/flashdebugger.jar;lib/treetable.jar;lib/minimal-json-0.9.5.jar;libsrc/ffdec_lib/lib/gnujpdf.jar;libsrc/ffdec_lib/lib/jna-3.5.1.jar;libsrc/ffdec_lib/lib/jna-platform-3.5.1.jar;libsrc/ffdec_lib/lib/flashdebugger.jar build javadoc reports