From 05bf7a1c88dd9de0532ab125e9e3802f5bcc0f35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= <jindra.petrik@gmail.com>
Date: Sun, 28 Mar 2021 11:22:01 +0200
Subject: [PATCH] Fixed: #1671 JPEG images display when not CMYK JPEG fixer to
 DefineBitsJPEG3 and 4.

---
 CHANGELOG.md                                  |   2 +
 lib/cmykjpeg.jar                              | Bin 90117 -> 90166 bytes
 libsrc/cmykjpeg/nbproject/build-impl.xml      | 715 +++++++++++++-----
 libsrc/cmykjpeg/nbproject/genfiles.properties |   6 +-
 libsrc/cmykjpeg/nbproject/project.properties  |  12 +
 .../monte/media/jpeg/CMYKJPEGImageReader.java |   4 +-
 .../flash/tags/DefineBitsJPEG3Tag.java        |  11 +-
 .../flash/tags/DefineBitsJPEG4Tag.java        |   9 +-
 8 files changed, 568 insertions(+), 191 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9912358c3..6d1457a5e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@ All notable changes to this project will be documented in this file.
 - AS decompilation - certain combinations of ifs and switch
 - AS3 jump deobfuscator - fix for try..catch clauses
 - [#1669] DefineBitsJPEG3/4 alpha premultiplied
+- [#1671] JPEG images display when not CMYK
 
 ## [14.3.1] - 2021-03-25
 ### Fixed
@@ -2172,6 +2173,7 @@ All notable changes to this project will be documented in this file.
 [#1669]: https://www.free-decompiler.com/flash/issues/1669
 [#1668]: https://www.free-decompiler.com/flash/issues/1668
 [#1670]: https://www.free-decompiler.com/flash/issues/1670
+[#1671]: https://www.free-decompiler.com/flash/issues/1671
 [#1665]: https://www.free-decompiler.com/flash/issues/1665
 [#1661]: https://www.free-decompiler.com/flash/issues/1661
 [#1435]: https://www.free-decompiler.com/flash/issues/1435
diff --git a/lib/cmykjpeg.jar b/lib/cmykjpeg.jar
index 179d50c90045419651ba06f1228941dd5bc3f88d..82cafaeccfcabafc2682cdd9b240debfe923d57e 100644
GIT binary patch
delta 22914
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
IR>=tdKiZ50@Bjb+

delta 22889
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
Qw0Q36ob6q;LWb@C0h;wl=>Px#

diff --git a/libsrc/cmykjpeg/nbproject/build-impl.xml b/libsrc/cmykjpeg/nbproject/build-impl.xml
index ed218bcac..2b7fdafff 100644
--- a/libsrc/cmykjpeg/nbproject/build-impl.xml
+++ b/libsrc/cmykjpeg/nbproject/build-impl.xml
@@ -19,7 +19,7 @@ is divided into following sections:
   - cleanup
 
         -->
-<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="cmykjpeg-impl">
+<project xmlns:if="ant:if" xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" xmlns:unless="ant:unless" basedir=".." default="default" name="cmykjpeg-impl">
     <fail message="Please build using Ant 1.8.0 or higher.">
         <condition>
             <not>
@@ -46,14 +46,79 @@ is divided into following sections:
         <property file="${user.properties.file}"/>
         <!-- The two properties below are usually overridden -->
         <!-- by the active platform. Just a fallback. -->
-        <property name="default.javac.source" value="1.4"/>
-        <property name="default.javac.target" value="1.4"/>
+        <property name="default.javac.source" value="1.6"/>
+        <property name="default.javac.target" value="1.6"/>
     </target>
     <target depends="-pre-init,-init-private,-init-user" name="-init-project">
         <property file="nbproject/configs/${config}.properties"/>
         <property file="nbproject/project.properties"/>
     </target>
-    <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init">
+    <target name="-init-modules-supported">
+        <condition property="modules.supported.internal" value="true">
+            <not>
+                <matches pattern="1\.[0-8](\..*)?" string="${javac.source}"/>
+            </not>
+        </condition>
+    </target>
+    <target depends="-init-modules-supported" if="modules.supported.internal" name="-init-macrodef-modulename">
+        <macrodef name="modulename" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute name="property"/>
+            <attribute name="sourcepath"/>
+            <sequential>
+                <loadresource property="@{property}" quiet="true">
+                    <javaresource classpath="@{sourcepath}" name="module-info.java" parentFirst="false"/>
+                    <filterchain>
+                        <stripjavacomments/>
+                        <linecontainsregexp>
+                            <regexp pattern="module .* \{"/>
+                        </linecontainsregexp>
+                        <tokenfilter>
+                            <linetokenizer/>
+                            <replaceregex flags="s" pattern="(\s*module\s+)(\S*)(\s*\{.*)" replace="\2"/>
+                        </tokenfilter>
+                        <striplinebreaks/>
+                    </filterchain>
+                </loadresource>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-modules-supported,-init-macrodef-modulename" if="modules.supported.internal" name="-init-source-module-properties">
+        <fail message="Java 9 support requires Ant 1.10.0 or higher.">
+            <condition>
+                <not>
+                    <antversion atleast="1.10.0"/>
+                </not>
+            </condition>
+        </fail>
+        <j2seproject3:modulename property="module.name" sourcepath="${src.dir}"/>
+        <condition property="named.module.internal">
+            <and>
+                <isset property="module.name"/>
+                <length length="0" string="${module.name}" when="greater"/>
+            </and>
+        </condition>
+        <condition property="unnamed.module.internal">
+            <not>
+                <isset property="named.module.internal"/>
+            </not>
+        </condition>
+        <property name="javac.modulepath" value=""/>
+        <property name="run.modulepath" value="${javac.modulepath}"/>
+        <property name="module.build.classes.dir" value="${build.classes.dir}"/>
+        <property name="debug.modulepath" value="${run.modulepath}"/>
+        <property name="javac.upgrademodulepath" value=""/>
+        <property name="run.upgrademodulepath" value="${javac.upgrademodulepath}"/>
+        <condition else="" property="javac.systemmodulepath.cmd.line.arg" value="--system '${javac.systemmodulepath}'">
+            <and>
+                <isset property="javac.systemmodulepath"/>
+                <length length="0" string="${javac.systemmodulepath}" when="greater"/>
+            </and>
+        </condition>
+        <property name="dist.jlink.dir" value="${dist.dir}/jlink"/>
+        <property name="dist.jlink.output" value="${dist.jlink.dir}/${application.title}"/>
+        <property name="module.name" value=""/>
+    </target>
+    <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property,-init-modules-supported" name="-do-init">
         <property name="platform.java" value="${java.home}/bin/java"/>
         <available file="${manifest.file}" property="manifest.available"/>
         <condition property="splashscreen.available">
@@ -76,7 +141,9 @@ is divided into following sections:
             <and>
                 <isset property="javac.profile"/>
                 <length length="0" string="${javac.profile}" when="greater"/>
-                <matches pattern="1\.[89](\..*)?" string="${javac.source}"/>
+                <not>
+                    <matches pattern="1\.[0-7](\..*)?" string="${javac.source}"/>
+                </not>
             </and>
         </condition>
         <condition property="do.archive">
@@ -87,15 +154,6 @@ is divided into following sections:
                 <istrue value="${not.archive.disabled}"/>
             </or>
         </condition>
-        <condition property="do.mkdist">
-            <and>
-                <isset property="do.archive"/>
-                <isset property="libs.CopyLibs.classpath"/>
-                <not>
-                    <istrue value="${mkdist.disabled}"/>
-                </not>
-            </and>
-        </condition>
         <condition property="do.archive+manifest.available">
             <and>
                 <isset property="manifest.available"/>
@@ -156,6 +214,7 @@ is divided into following sections:
         <property name="application.args" value=""/>
         <property name="source.encoding" value="${file.encoding}"/>
         <property name="runtime.encoding" value="${source.encoding}"/>
+        <property name="manifest.encoding" value="${source.encoding}"/>
         <condition property="javadoc.encoding.used" value="${javadoc.encoding}">
             <and>
                 <isset property="javadoc.encoding"/>
@@ -249,11 +308,80 @@ is divided into following sections:
             </sequential>
         </macrodef>
     </target>
-    <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors">
+    <target depends="-init-ap-cmdline-properties,-init-source-module-properties" if="modules.supported.internal" name="-init-macrodef-javac-with-module">
         <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
             <attribute default="${src.dir}" name="srcdir"/>
             <attribute default="${build.classes.dir}" name="destdir"/>
             <attribute default="${javac.classpath}" name="classpath"/>
+            <attribute default="${javac.modulepath}" name="modulepath"/>
+            <attribute default="${javac.upgrademodulepath}" name="upgrademodulepath"/>
+            <attribute default="${javac.processorpath}" name="processorpath"/>
+            <attribute default="${javac.processormodulepath}" name="processormodulepath"/>
+            <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="${javac.debug}" name="debug"/>
+            <attribute default="${empty.dir}" name="sourcepath" unless:set="named.module.internal"/>
+            <attribute default="${src.dir}" if:set="named.module.internal" name="sourcepath"/>
+            <attribute default="${empty.dir}" name="gensrcdir"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <condition property="warn.excludes.internal">
+                    <and>
+                        <isset property="named.module.internal"/>
+                        <length length="0" string="@{excludes}" trim="true" when="greater"/>
+                    </and>
+                </condition>
+                <echo if:set="warn.excludes.internal" level="warning" message="The javac excludes are not supported in the JDK 9 Named Module."/>
+                <property location="${build.dir}/empty" name="empty.dir"/>
+                <mkdir dir="${empty.dir}"/>
+                <mkdir dir="@{apgeneratedsrcdir}"/>
+                <condition property="processormodulepath.set">
+                    <resourcecount count="0" when="greater">
+                        <path>
+                            <pathelement path="@{processormodulepath}"/>
+                        </path>
+                    </resourcecount>
+                </condition>
+                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
+                    <src>
+                        <dirset dir="@{gensrcdir}" erroronmissingdir="false">
+                            <include name="*"/>
+                        </dirset>
+                    </src>
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                    <modulepath>
+                        <path path="@{modulepath}"/>
+                    </modulepath>
+                    <upgrademodulepath>
+                        <path path="@{upgrademodulepath}"/>
+                    </upgrademodulepath>
+                    <compilerarg line="${javac.systemmodulepath.cmd.line.arg}"/>
+                    <compilerarg line="${javac.profile.cmd.line.arg}"/>
+                    <compilerarg line="${javac.compilerargs}"/>
+                    <compilerarg if:set="processormodulepath.set" value="--processor-module-path"/>
+                    <compilerarg if:set="processormodulepath.set" path="@{processormodulepath}"/>
+                    <compilerarg unless:set="processormodulepath.set" value="-processorpath"/>
+                    <compilerarg path="@{processorpath}:${empty.dir}" unless:set="processormodulepath.set"/>
+                    <compilerarg line="${ap.processors.internal}"/>
+                    <compilerarg line="${annotation.processing.processor.options}"/>
+                    <compilerarg value="-s"/>
+                    <compilerarg path="@{apgeneratedsrcdir}"/>
+                    <compilerarg line="${ap.proc.none.internal}"/>
+                    <customize/>
+                </javac>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-ap-cmdline-properties,-init-source-module-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors" unless="modules.supported.internal">
+        <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${src.dir}" name="srcdir"/>
+            <attribute default="${build.classes.dir}" name="destdir"/>
+            <attribute default="${javac.classpath}" name="classpath"/>
+            <attribute default="${javac.modulepath}" name="modulepath"/>
+            <attribute default="${javac.upgrademodulepath}" name="upgrademodulepath"/>
             <attribute default="${javac.processorpath}" name="processorpath"/>
             <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
             <attribute default="${includes}" name="includes"/>
@@ -290,11 +418,13 @@ is divided into following sections:
             </sequential>
         </macrodef>
     </target>
-    <target depends="-init-ap-cmdline-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal">
+    <target depends="-init-ap-cmdline-properties,-init-source-module-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal">
         <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
             <attribute default="${src.dir}" name="srcdir"/>
             <attribute default="${build.classes.dir}" name="destdir"/>
             <attribute default="${javac.classpath}" name="classpath"/>
+            <attribute default="${javac.modulepath}" name="modulepath"/>
+            <attribute default="${javac.upgrademodulepath}" name="upgrademodulepath"/>
             <attribute default="${javac.processorpath}" name="processorpath"/>
             <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
             <attribute default="${includes}" name="includes"/>
@@ -323,7 +453,7 @@ is divided into following sections:
             </sequential>
         </macrodef>
     </target>
-    <target depends="-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors" name="-init-macrodef-javac">
+    <target depends="-init-macrodef-javac-with-module,-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors" name="-init-macrodef-javac">
         <macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-project/3">
             <attribute default="${src.dir}" name="srcdir"/>
             <attribute default="${build.classes.dir}" name="destdir"/>
@@ -378,30 +508,59 @@ is divided into following sections:
         <property name="test.binarytestincludes" value=""/>
         <property name="test.binaryexcludes" value=""/>
     </target>
-    <target if="${nb.junit.single}" name="-init-macrodef-junit-single" unless="${nb.junit.batch}">
-        <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
+    <target depends="-init-modules-supported" if="modules.supported.internal" name="-init-macrodef-junit-prototype-with-module">
+        <macrodef name="junit-prototype" uri="http://www.netbeans.org/ns/j2se-project/3">
             <attribute default="${includes}" name="includes"/>
             <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <element name="customize" optional="true"/>
+            <element name="customizePrototype" optional="true"/>
             <sequential>
                 <property name="junit.forkmode" value="perTest"/>
                 <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
-                    <test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/>
                     <syspropertyset>
                         <propertyref prefix="test-sys-prop."/>
                         <mapper from="test-sys-prop.*" to="*" type="glob"/>
                     </syspropertyset>
+                    <classpath>
+                        <path path="${run.test.classpath}"/>
+                    </classpath>
+                    <modulepath>
+                        <path path="${run.test.modulepath}"/>
+                    </modulepath>
                     <formatter type="brief" usefile="false"/>
                     <formatter type="xml"/>
+                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
                     <jvmarg value="-ea"/>
-                    <customize/>
+                    <jvmarg line="${run.test.jvmargs}"/>
+                    <customizePrototype/>
                 </junit>
             </sequential>
         </macrodef>
     </target>
-    <target depends="-init-test-properties" if="${nb.junit.batch}" name="-init-macrodef-junit-batch" unless="${nb.junit.single}">
+    <target depends="-init-modules-supported" name="-init-macrodef-junit-prototype-without-module" unless="modules.supported.internal">
+        <macrodef name="junit-prototype" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <element name="customizePrototype" optional="true"/>
+            <sequential>
+                <property name="junit.forkmode" value="perTest"/>
+                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
+                    <syspropertyset>
+                        <propertyref prefix="test-sys-prop."/>
+                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
+                    </syspropertyset>
+                    <classpath>
+                        <path path="${run.test.classpath}"/>
+                    </classpath>
+                    <formatter type="brief" usefile="false"/>
+                    <formatter type="xml"/>
+                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
+                    <jvmarg value="-ea"/>
+                    <customizePrototype/>
+                </junit>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-test-properties,-init-macrodef-junit-prototype-with-module,-init-macrodef-junit-prototype-without-module" if="${nb.junit.single}" name="-init-macrodef-junit-single" unless="${nb.junit.batch}">
         <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
             <attribute default="${includes}" name="includes"/>
             <attribute default="${excludes}" name="excludes"/>
@@ -409,25 +568,36 @@ is divided into following sections:
             <attribute default="" name="testmethods"/>
             <element name="customize" optional="true"/>
             <sequential>
-                <property name="junit.forkmode" value="perTest"/>
-                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
-                    <batchtest todir="${build.test.results.dir}">
-                        <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
-                            <filename name="@{testincludes}"/>
-                        </fileset>
-                        <fileset dir="${build.test.classes.dir}" excludes="@{excludes},${excludes},${test.binaryexcludes}" includes="${test.binaryincludes}">
-                            <filename name="${test.binarytestincludes}"/>
-                        </fileset>
-                    </batchtest>
-                    <syspropertyset>
-                        <propertyref prefix="test-sys-prop."/>
-                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
-                    </syspropertyset>
-                    <formatter type="brief" usefile="false"/>
-                    <formatter type="xml"/>
-                    <jvmarg value="-ea"/>
-                    <customize/>
-                </junit>
+                <j2seproject3:junit-prototype>
+                    <customizePrototype>
+                        <test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/>
+                        <customize/>
+                    </customizePrototype>
+                </j2seproject3:junit-prototype>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-test-properties,-init-macrodef-junit-prototype-with-module,-init-macrodef-junit-prototype-without-module" if="${nb.junit.batch}" name="-init-macrodef-junit-batch" unless="${nb.junit.single}">
+        <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="**" name="testincludes"/>
+            <attribute default="" name="testmethods"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <j2seproject3:junit-prototype>
+                    <customizePrototype>
+                        <batchtest todir="${build.test.results.dir}">
+                            <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
+                                <filename name="@{testincludes}"/>
+                            </fileset>
+                            <fileset dir="${build.test.classes.dir}" excludes="@{excludes},${excludes},${test.binaryexcludes}" includes="${test.binaryincludes}">
+                                <filename name="${test.binarytestincludes}"/>
+                            </fileset>
+                        </batchtest>
+                        <customize/>
+                    </customizePrototype>
+                </j2seproject3:junit-prototype>
             </sequential>
         </macrodef>
     </target>
@@ -455,6 +625,10 @@ is divided into following sections:
                         <propertyref prefix="test-sys-prop."/>
                         <mapper from="test-sys-prop.*" to="*" type="glob"/>
                     </propertyset>
+                    <classpath>
+                        <path path="${run.test.classpath}"/>
+                    </classpath>
+                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
                     <customize/>
                 </testng>
             </sequential>
@@ -509,10 +683,6 @@ is divided into following sections:
             <sequential>
                 <j2seproject3:test-impl excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
                     <customize>
-                        <classpath>
-                            <path path="${run.test.classpath}"/>
-                        </classpath>
-                        <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
                         <jvmarg line="${run.jvmargs}"/>
                         <jvmarg line="${run.jvmargs.ide}"/>
                     </customize>
@@ -520,74 +690,20 @@ is divided into following sections:
             </sequential>
         </macrodef>
     </target>
-    <target if="${junit.available}" name="-init-macrodef-junit-debug" unless="${nb.junit.batch}">
-        <macrodef name="junit-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <property name="junit.forkmode" value="perTest"/>
-                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
-                    <test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/>
-                    <syspropertyset>
-                        <propertyref prefix="test-sys-prop."/>
-                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
-                    </syspropertyset>
-                    <formatter type="brief" usefile="false"/>
-                    <formatter type="xml"/>
-                    <jvmarg value="-ea"/>
-                    <jvmarg line="${debug-args-line}"/>
-                    <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
-                    <customize/>
-                </junit>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-test-properties" if="${nb.junit.batch}" name="-init-macrodef-junit-debug-batch">
-        <macrodef name="junit-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <property name="junit.forkmode" value="perTest"/>
-                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
-                    <batchtest todir="${build.test.results.dir}">
-                        <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
-                            <filename name="@{testincludes}"/>
-                        </fileset>
-                        <fileset dir="${build.test.classes.dir}" excludes="@{excludes},${excludes},${test.binaryexcludes}" includes="${test.binaryincludes}">
-                            <filename name="${test.binarytestincludes}"/>
-                        </fileset>
-                    </batchtest>
-                    <syspropertyset>
-                        <propertyref prefix="test-sys-prop."/>
-                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
-                    </syspropertyset>
-                    <formatter type="brief" usefile="false"/>
-                    <formatter type="xml"/>
-                    <jvmarg value="-ea"/>
-                    <jvmarg line="${debug-args-line}"/>
-                    <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
-                    <customize/>
-                </junit>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-macrodef-junit-debug,-init-macrodef-junit-debug-batch" if="${junit.available}" name="-init-macrodef-junit-debug-impl">
+    <target depends="-init-macrodef-junit" if="${junit.available}" name="-init-macrodef-junit-debug-impl">
         <macrodef name="test-debug-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
             <attribute default="${includes}" name="includes"/>
             <attribute default="${excludes}" name="excludes"/>
             <attribute default="**" name="testincludes"/>
             <attribute default="" name="testmethods"/>
-            <element implicit="true" name="customize" optional="true"/>
+            <element name="customizeDebuggee" optional="true"/>
             <sequential>
-                <j2seproject3:junit-debug excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
-                    <customize/>
-                </j2seproject3:junit-debug>
+                <j2seproject3:junit excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
+                    <customize>
+                        <jvmarg value="-agentlib:jdwp=transport=${debug-transport},address=${jpda.address}"/>
+                        <customizeDebuggee/>
+                    </customize>
+                </j2seproject3:junit>
             </sequential>
         </macrodef>
     </target>
@@ -606,14 +722,14 @@ is divided into following sections:
                 <delete dir="${build.test.results.dir}" quiet="true"/>
                 <mkdir dir="${build.test.results.dir}"/>
                 <j2seproject3:debug classname="org.testng.TestNG" classpath="${debug.test.classpath}">
-                    <customize>
+                    <customizeDebuggee>
                         <customize2/>
                         <jvmarg value="-ea"/>
                         <arg line="${testng.debug.mode}"/>
                         <arg line="-d ${build.test.results.dir}"/>
                         <arg line="-listener org.testng.reporters.VerboseReporter"/>
                         <arg line="${testng.cmd.args}"/>
-                    </customize>
+                    </customizeDebuggee>
                 </j2seproject3:debug>
             </sequential>
         </macrodef>
@@ -640,14 +756,10 @@ is divided into following sections:
             <attribute default="" name="testMethod"/>
             <sequential>
                 <j2seproject3:test-debug-impl excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
-                    <customize>
-                        <classpath>
-                            <path path="${run.test.classpath}"/>
-                        </classpath>
-                        <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
+                    <customizeDebuggee>
                         <jvmarg line="${run.jvmargs}"/>
                         <jvmarg line="${run.jvmargs.ide}"/>
-                    </customize>
+                    </customizeDebuggee>
                 </j2seproject3:test-debug-impl>
             </sequential>
         </macrodef>
@@ -727,10 +839,14 @@ is divided into following sections:
     <target depends="-init-debug-args" name="-init-macrodef-nbjpda">
         <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/j2se-project/1">
             <attribute default="${main.class}" name="name"/>
+            <attribute default="${debug.modulepath}" name="modulepath"/>
             <attribute default="${debug.classpath}" name="classpath"/>
             <attribute default="" name="stopclassname"/>
             <sequential>
                 <nbjpdastart addressproperty="jpda.address" name="@{name}" stopclassname="@{stopclassname}" transport="${debug-transport}">
+                    <modulepath>
+                        <path path="@{modulepath}"/>
+                    </modulepath>
                     <classpath>
                         <path path="@{classpath}"/>
                     </classpath>
@@ -749,18 +865,6 @@ is divided into following sections:
         </macrodef>
     </target>
     <target name="-init-debug-args">
-        <property name="version-output" value="java version &quot;${ant.java.version}"/>
-        <condition property="have-jdk-older-than-1.4">
-            <or>
-                <contains string="${version-output}" substring="java version &quot;1.0"/>
-                <contains string="${version-output}" substring="java version &quot;1.1"/>
-                <contains string="${version-output}" substring="java version &quot;1.2"/>
-                <contains string="${version-output}" substring="java version &quot;1.3"/>
-            </or>
-        </condition>
-        <condition else="-Xdebug" property="debug-args-line" value="-Xdebug -Xnoagent -Djava.compiler=none">
-            <istrue value="${have-jdk-older-than-1.4}"/>
-        </condition>
         <condition else="dt_socket" property="debug-transport-by-os" value="dt_shmem">
             <os family="windows"/>
         </condition>
@@ -770,21 +874,46 @@ is divided into following sections:
     </target>
     <target depends="-init-debug-args" name="-init-macrodef-debug">
         <macrodef name="debug" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${module.name}" name="modulename"/>
             <attribute default="${main.class}" name="classname"/>
+            <attribute default="${debug.modulepath}" name="modulepath"/>
             <attribute default="${debug.classpath}" name="classpath"/>
+            <element name="customizeDebuggee" optional="true"/>
+            <sequential>
+                <j2seproject1:java classname="@{classname}" classpath="@{classpath}" modulename="@{modulename}" modulepath="@{modulepath}">
+                    <customize>
+                        <jvmarg value="-agentlib:jdwp=transport=${debug-transport},address=${jpda.address}"/>
+                        <customizeDebuggee/>
+                    </customize>
+                </j2seproject1:java>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-source-module-properties" if="named.module.internal" name="-init-macrodef-java-with-module">
+        <macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1">
+            <attribute default="${module.name}" name="modulename"/>
+            <attribute default="${main.class}" name="classname"/>
+            <attribute default="${run.modulepath}" name="modulepath"/>
+            <attribute default="${run.upgrademodulepath}" name="upgrademodulepath"/>
+            <attribute default="${run.classpath}" name="classpath"/>
+            <attribute default="jvm" name="jvm"/>
             <element name="customize" optional="true"/>
             <sequential>
-                <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true">
-                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
-                    <jvmarg line="${debug-args-line}"/>
-                    <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
+                <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true" module="@{modulename}">
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                    <modulepath>
+                        <pathelement path="@{modulepath}"/>
+                        <pathelement location="${module.build.classes.dir}"/>
+                    </modulepath>
+                    <upgrademodulepath>
+                        <path path="@{upgrademodulepath}"/>
+                    </upgrademodulepath>
                     <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
                     <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
                     <jvmarg line="${run.jvmargs}"/>
                     <jvmarg line="${run.jvmargs.ide}"/>
-                    <classpath>
-                        <path path="@{classpath}"/>
-                    </classpath>
                     <syspropertyset>
                         <propertyref prefix="run-sys-prop."/>
                         <mapper from="run-sys-prop.*" to="*" type="glob"/>
@@ -794,9 +923,44 @@ is divided into following sections:
             </sequential>
         </macrodef>
     </target>
-    <target name="-init-macrodef-java">
+    <target depends="-init-source-module-properties" if="unnamed.module.internal" name="-init-macrodef-java-with-unnamed-module">
         <macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1">
+            <attribute default="" name="modulename"/>
             <attribute default="${main.class}" name="classname"/>
+            <attribute default="${run.modulepath}" name="modulepath"/>
+            <attribute default="${run.upgrademodulepath}" name="upgrademodulepath"/>
+            <attribute default="${run.classpath}" name="classpath"/>
+            <attribute default="jvm" name="jvm"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true">
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                    <modulepath>
+                        <path path="@{modulepath}"/>
+                    </modulepath>
+                    <upgrademodulepath>
+                        <path path="@{upgrademodulepath}"/>
+                    </upgrademodulepath>
+                    <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
+                    <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
+                    <jvmarg line="${run.jvmargs}"/>
+                    <jvmarg line="${run.jvmargs.ide}"/>
+                    <syspropertyset>
+                        <propertyref prefix="run-sys-prop."/>
+                        <mapper from="run-sys-prop.*" to="*" type="glob"/>
+                    </syspropertyset>
+                    <customize/>
+                </java>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-source-module-properties" name="-init-macrodef-java-without-module" unless="modules.supported.internal">
+        <macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1">
+            <attribute default="" name="modulename"/>
+            <attribute default="${main.class}" name="classname"/>
+            <attribute default="" name="modulepath"/>
             <attribute default="${run.classpath}" name="classpath"/>
             <attribute default="jvm" name="jvm"/>
             <element name="customize" optional="true"/>
@@ -819,6 +983,7 @@ is divided into following sections:
             </sequential>
         </macrodef>
     </target>
+    <target depends="-init-macrodef-java-with-module, -init-macrodef-java-with-unnamed-module, -init-macrodef-java-without-module" name="-init-macrodef-java"/>
     <target name="-init-macrodef-copylibs">
         <macrodef name="copylibs" uri="http://www.netbeans.org/ns/j2se-project/3">
             <attribute default="${manifest.file}" name="manifest"/>
@@ -840,7 +1005,7 @@ is divided into following sections:
                     </chainedmapper>
                 </pathconvert>
                 <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
-                <copylibs compress="${jar.compress}" excludeFromCopy="${copylibs.excludes}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" rebase="${copylibs.rebase}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
+                <copylibs compress="${jar.compress}" excludeFromCopy="${copylibs.excludes}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" manifestencoding="UTF-8" rebase="${copylibs.rebase}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
                     <fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
                     <manifest>
                         <attribute name="Class-Path" value="${jar.classpath}"/>
@@ -852,7 +1017,7 @@ is divided into following sections:
     </target>
     <target name="-init-presetdef-jar">
         <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">
-            <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}">
+            <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}" manifestencoding="UTF-8">
                 <j2seproject1:fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
             </jar>
         </presetdef>
@@ -908,7 +1073,9 @@ is divided into following sections:
         <available file="${build.classes.dir}/.netbeans_automatic_build" property="netbeans.automatic.build"/>
     </target>
     <target depends="init" if="netbeans.automatic.build" name="-clean-after-automatic-build">
-        <antcall target="clean"/>
+        <antcall target="clean">
+            <param name="no.dependencies" value="true"/>
+        </antcall>
     </target>
     <target depends="init,deps-jar" name="-pre-pre-compile">
         <mkdir dir="${build.classes.dir}"/>
@@ -949,7 +1116,7 @@ is divided into following sections:
     <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">
         <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
         <j2seproject3:force-recompile/>
-        <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}" sourcepath="${src.dir}"/>
+        <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}, module-info.java" sourcepath="${src.dir}"/>
     </target>
     <target name="-post-compile-single">
         <!-- Empty placeholder for easier customization. -->
@@ -969,21 +1136,40 @@ is divided into following sections:
         <!-- Empty placeholder for easier customization. -->
         <!-- You can override this target in the ../build.xml file. -->
     </target>
+    <target depends="init,compile" name="-check-module-main-class">
+        <pathconvert property="main.class.file">
+            <string value="${main.class}"/>
+            <unpackagemapper from="*" to="*.class"/>
+        </pathconvert>
+        <condition property="do.module.main.class">
+            <and>
+                <isset property="main.class.available"/>
+                <available file="${build.classes.dir}/module-info.class"/>
+                <available file="${build.classes.dir}/${main.class.file}"/>
+                <isset property="libs.CopyLibs.classpath"/>
+                <available classname="org.netbeans.modules.java.j2seproject.moduletask.ModuleMainClass" classpath="${libs.CopyLibs.classpath}"/>
+            </and>
+        </condition>
+    </target>
+    <target depends="-check-module-main-class" if="do.module.main.class" name="-set-module-main-class">
+        <taskdef classname="org.netbeans.modules.java.j2seproject.moduletask.ModuleMainClass" classpath="${libs.CopyLibs.classpath}" name="modulemainclass"/>
+        <modulemainclass failonerror="false" mainclass="${main.class}" moduleinfo="${build.classes.dir}/module-info.class"/>
+    </target>
     <target depends="init" if="do.archive" name="-do-jar-create-manifest" unless="manifest.available">
         <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
         <touch file="${tmp.manifest.file}" verbose="false"/>
     </target>
     <target depends="init" if="do.archive+manifest.available" name="-do-jar-copy-manifest">
         <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
-        <copy file="${manifest.file}" tofile="${tmp.manifest.file}"/>
+        <copy encoding="${manifest.encoding}" file="${manifest.file}" outputencoding="UTF-8" tofile="${tmp.manifest.file}"/>
     </target>
     <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+main.class.available" name="-do-jar-set-mainclass">
-        <manifest file="${tmp.manifest.file}" mode="update">
+        <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update">
             <attribute name="Main-Class" value="${main.class}"/>
         </manifest>
     </target>
     <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+profile.available" name="-do-jar-set-profile">
-        <manifest file="${tmp.manifest.file}" mode="update">
+        <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update">
             <attribute name="Profile" value="${javac.profile}"/>
         </manifest>
     </target>
@@ -991,25 +1177,65 @@ is divided into following sections:
         <basename file="${application.splash}" property="splashscreen.basename"/>
         <mkdir dir="${build.classes.dir}/META-INF"/>
         <copy failonerror="false" file="${application.splash}" todir="${build.classes.dir}/META-INF"/>
-        <manifest file="${tmp.manifest.file}" mode="update">
+        <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update">
             <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/>
         </manifest>
     </target>
-    <target depends="init,-init-macrodef-copylibs,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen" if="do.mkdist" name="-do-jar-copylibs">
+    <target depends="init,compile" name="-check-do-mkdist">
+        <condition property="do.mkdist">
+            <and>
+                <isset property="do.archive"/>
+                <isset property="libs.CopyLibs.classpath"/>
+                <not>
+                    <istrue value="${mkdist.disabled}"/>
+                </not>
+                <not>
+                    <available file="${build.classes.dir}/module-info.class"/>
+                </not>
+            </and>
+        </condition>
+    </target>
+    <target depends="init,-init-macrodef-copylibs,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen,-check-do-mkdist" if="do.mkdist" name="-do-jar-copylibs">
         <j2seproject3:copylibs manifest="${tmp.manifest.file}"/>
         <echo level="info">To run this application from the command line without Ant, try:</echo>
         <property location="${dist.jar}" name="dist.jar.resolved"/>
         <echo level="info">java -jar "${dist.jar.resolved}"</echo>
     </target>
-    <target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen" if="do.archive" name="-do-jar-jar" unless="do.mkdist">
+    <target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen,-check-do-mkdist" if="do.archive" name="-do-jar-jar" unless="do.mkdist">
         <j2seproject1:jar manifest="${tmp.manifest.file}"/>
         <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
         <property location="${dist.jar}" name="dist.jar.resolved"/>
+        <condition else="${dist.jar.resolved}" property="jar.usage.message.class.path.replacement" value="">
+            <isset property="named.module.internal"/>
+        </condition>
         <pathconvert property="run.classpath.with.dist.jar">
             <path path="${run.classpath}"/>
+            <map from="${build.classes.dir.resolved}" to="${jar.usage.message.class.path.replacement}"/>
+        </pathconvert>
+        <pathconvert property="run.modulepath.with.dist.jar">
+            <path location="${dist.jar.resolved}"/>
+            <path path="${run.modulepath}"/>
             <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
         </pathconvert>
-        <condition else="" property="jar.usage.message" value="To run this application from the command line without Ant, try:${line.separator}${platform.java} -cp ${run.classpath.with.dist.jar} ${main.class}">
+        <condition else="${run.modulepath}" property="jar.usage.message.run.modulepath.with.dist.jar" value="${run.modulepath.with.dist.jar}">
+            <isset property="named.module.internal"/>
+        </condition>
+        <condition else="" property="jar.usage.message.module.path" value=" -p ${jar.usage.message.run.modulepath.with.dist.jar}">
+            <and>
+                <isset property="modules.supported.internal"/>
+                <length length="0" string="${jar.usage.message.run.modulepath.with.dist.jar}" when="greater"/>
+            </and>
+        </condition>
+        <condition else="" property="jar.usage.message.class.path" value=" -cp ${run.classpath.with.dist.jar}">
+            <length length="0" string="${run.classpath.with.dist.jar}" when="greater"/>
+        </condition>
+        <condition else="/${main.class}" property="jar.usage.message.main.class.class.selector" value="">
+            <isset property="do.module.main.class"/>
+        </condition>
+        <condition else=" ${main.class}" property="jar.usage.message.main.class" value=" -m ${module.name}${jar.usage.message.main.class.class.selector}">
+            <isset property="named.module.internal"/>
+        </condition>
+        <condition else="" property="jar.usage.message" value="To run this application from the command line without Ant, try:${line.separator}${platform.java}${jar.usage.message.module.path}${jar.usage.message.class.path}${jar.usage.message.main.class}">
             <isset property="main.class.available"/>
         </condition>
         <condition else="debug" property="jar.usage.level" value="info">
@@ -1028,8 +1254,73 @@ is divided into following sections:
         <!-- Empty placeholder for easier customization. -->
         <!-- You can override this target in the ../build.xml file. -->
     </target>
-    <target depends="init,compile,-pre-jar,-do-jar-without-libraries,-do-jar-with-libraries,-post-jar" name="-do-jar"/>
-    <target depends="init,compile,-pre-jar,-do-jar,-post-jar" description="Build JAR." name="jar"/>
+    <target depends="init,compile,-pre-jar,-set-module-main-class,-do-jar-without-libraries,-do-jar-with-libraries,-post-jar" name="-do-jar"/>
+    <target depends="init,compile,-pre-jar,-do-jar,-post-jar,deploy" description="Build JAR." name="jar"/>
+    <!--
+                =================
+                DEPLOY SECTION
+                =================
+            -->
+    <target name="-pre-deploy">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init" name="-check-jlink">
+        <condition property="do.jlink.internal">
+            <and>
+                <istrue value="${do.jlink}"/>
+                <isset property="do.archive"/>
+                <isset property="named.module.internal"/>
+            </and>
+        </condition>
+    </target>
+    <target depends="init,-do-jar,-post-jar,-pre-deploy,-check-jlink" if="do.jlink.internal" name="-do-deploy">
+        <delete dir="${dist.jlink.dir}" failonerror="false" quiet="true"/>
+        <property name="jlink.launcher.name" value="${application.title}"/>
+        <condition else="${module.name}" property="jlink.add.modules" value="${module.name},${jlink.additionalmodules}">
+            <and>
+                <isset property="jlink.additionalmodules"/>
+                <length length="0" string="${jlink.additionalmodules}" when="greater"/>
+            </and>
+        </condition>
+        <condition property="jlink.do.strip.internal">
+            <and>
+                <isset property="jlink.strip"/>
+                <istrue value="${jlink.strip}"/>
+            </and>
+        </condition>
+        <condition property="jlink.do.additionalparam.internal">
+            <and>
+                <isset property="jlink.additionalparam"/>
+                <length length="0" string="${jlink.additionalparam}" when="greater"/>
+            </and>
+        </condition>
+        <condition property="jlink.do.launcher.internal">
+            <and>
+                <istrue value="${jlink.launcher}"/>
+                <isset property="main.class.available"/>
+            </and>
+        </condition>
+        <property name="platform.jlink" value="${jdk.home}/bin/jlink"/>
+        <property name="jlink.systemmodules.internal" value="${jdk.home}/jmods"/>
+        <exec executable="${platform.jlink}">
+            <arg value="--module-path"/>
+            <arg path="${jlink.systemmodules.internal}:${run.modulepath}:${dist.jar}"/>
+            <arg value="--add-modules"/>
+            <arg value="${jlink.add.modules}"/>
+            <arg if:set="jlink.do.strip.internal" value="--strip-debug"/>
+            <arg if:set="jlink.do.launcher.internal" value="--launcher"/>
+            <arg if:set="jlink.do.launcher.internal" value="${jlink.launcher.name}=${module.name}/${main.class}"/>
+            <arg if:set="jlink.do.additionalparam.internal" line="${jlink.additionalparam}"/>
+            <arg value="--output"/>
+            <arg value="${dist.jlink.output}"/>
+        </exec>
+    </target>
+    <target name="-post-deploy">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="-do-jar,-post-jar,-pre-deploy,-do-deploy,-post-deploy" name="deploy"/>
     <!--
                 =================
                 EXECUTION SECTION
@@ -1066,9 +1357,9 @@ is divided into following sections:
     </target>
     <target depends="init,compile" name="-debug-start-debuggee">
         <j2seproject3:debug>
-            <customize>
+            <customizeDebuggee>
                 <arg line="${application.args}"/>
-            </customize>
+            </customizeDebuggee>
         </j2seproject3:debug>
     </target>
     <target depends="init,compile,-debug-start-debugger,-debug-start-debuggee" description="Debug project in IDE." if="netbeans.home" name="debug"/>
@@ -1134,28 +1425,24 @@ is divided into following sections:
             </customize>
         </profile>
     </target>
-    <target depends="profile-init,compile-test-single" if="profiler.info.jvmargs.agent" name="-profile-test-single-pre72">
+    <target depends="-init-macrodef-junit,profile-init,compile-test-single" if="profiler.info.jvmargs.agent" name="-profile-test-single-pre72">
         <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
         <nbprofiledirect>
             <classpath>
                 <path path="${run.test.classpath}"/>
             </classpath>
         </nbprofiledirect>
-        <junit dir="${profiler.info.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" jvm="${profiler.info.jvm}" showoutput="true">
-            <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/>
-            <jvmarg value="${profiler.info.jvmargs.agent}"/>
-            <jvmarg line="${profiler.info.jvmargs}"/>
-            <test name="${profile.class}"/>
-            <classpath>
-                <path path="${run.test.classpath}"/>
-            </classpath>
-            <syspropertyset>
-                <propertyref prefix="test-sys-prop."/>
-                <mapper from="test-sys-prop.*" to="*" type="glob"/>
-            </syspropertyset>
-            <formatter type="brief" usefile="false"/>
-            <formatter type="xml"/>
-        </junit>
+        <j2seproject3:junit excludes="${excludes}" includes="${includes}" testincludes="${profile.class}" testmethods="">
+            <customize>
+                <jvmarg value="-agentlib:jdwp=transport=${debug-transport},address=${jpda.address}"/>
+                <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/>
+                <jvmarg value="${profiler.info.jvmargs.agent}"/>
+                <jvmarg line="${profiler.info.jvmargs}"/>
+                <classpath>
+                    <path path="${run.test.classpath}"/>
+                </classpath>
+            </customize>
+        </j2seproject3:junit>
     </target>
     <!--
                 end of pre NB72 profiling section
@@ -1186,7 +1473,7 @@ is divided into following sections:
     <target depends="-profile-check" description="Profile a selected class in the IDE." if="profiler.configured" name="profile-test-with-main">
         <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
         <startprofiler/>
-        <antcal target="run-test-with-main"/>
+        <antcall target="run-test-with-main"/>
     </target>
     <target depends="-profile-check,-profile-applet-pre72" if="profiler.configured" name="profile-applet" unless="profiler.info.jvmargs.agent">
         <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
@@ -1211,6 +1498,12 @@ is divided into following sections:
         <condition else="" property="bug5101868workaround" value="*.java">
             <matches pattern="1\.[56](\..*)?" string="${java.version}"/>
         </condition>
+        <condition else="" property="javadoc.html5.cmd.line.arg" value="-html5">
+            <and>
+                <isset property="javadoc.html5"/>
+                <available file="${jdk.home}${file.separator}lib${file.separator}jrt-fs.jar"/>
+            </and>
+        </condition>
         <javadoc additionalparam="-J-Dfile.encoding=${file.encoding} ${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
             <classpath>
                 <path path="${javac.classpath}"/>
@@ -1223,6 +1516,7 @@ is divided into following sections:
                 <exclude name="*.java"/>
             </fileset>
             <arg line="${javadoc.endorsed.classpath.cmd.line.arg}"/>
+            <arg line="${javadoc.html5.cmd.line.arg}"/>
         </javadoc>
         <copy todir="${dist.javadoc.dir}">
             <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
@@ -1249,11 +1543,63 @@ is divided into following sections:
         <!-- Empty placeholder for easier customization. -->
         <!-- You can override this target in the ../build.xml file. -->
     </target>
+    <target depends="-init-source-module-properties" if="named.module.internal" name="-init-test-javac-module-properties-with-module">
+        <j2seproject3:modulename property="test.module.name" sourcepath="${test.src.dir}"/>
+        <condition else="${empty.dir}" property="javac.test.sourcepath" value="${test.src.dir}">
+            <and>
+                <isset property="test.module.name"/>
+                <length length="0" string="${test.module.name}" when="greater"/>
+            </and>
+        </condition>
+        <condition else="--patch-module ${module.name}=${test.src.dir} --add-reads ${module.name}=ALL-UNNAMED" property="javac.test.compilerargs" value="--add-reads ${test.module.name}=ALL-UNNAMED">
+            <and>
+                <isset property="test.module.name"/>
+                <length length="0" string="${test.module.name}" when="greater"/>
+            </and>
+        </condition>
+    </target>
+    <target depends="-init-source-module-properties" if="named.module.internal" name="-init-test-run-module-properties">
+        <condition else="${module.name}" property="run.test.addexport.source.module.internal" value="${test.module.name}">
+            <and>
+                <isset property="test.module.name"/>
+                <length length="0" string="${test.module.name}" when="greater"/>
+            </and>
+        </condition>
+        <fileset dir="${build.test.classes.dir}" id="run.test.packages.internal" includes="**/*.class"/>
+        <property location="${build.test.classes.dir}" name="build.test.classes.dir.abs.internal"/>
+        <pathconvert pathsep=" " property="run.test.addexports.internal" refid="run.test.packages.internal">
+            <chainedmapper>
+                <regexpmapper from="^(.*)\Q${file.separator}\E.*\.class$$" to="\1"/>
+                <filtermapper>
+                    <uniqfilter/>
+                    <replacestring from="${build.test.classes.dir.abs.internal}" to=""/>
+                </filtermapper>
+                <cutdirsmapper dirs="1"/>
+                <packagemapper from="*" to="--add-exports ${run.test.addexport.source.module.internal}/*=ALL-UNNAMED"/>
+            </chainedmapper>
+        </pathconvert>
+        <condition else="--patch-module ${module.name}=${build.test.classes.dir} --add-modules ${module.name} --add-reads ${module.name}=ALL-UNNAMED ${run.test.addexports.internal}" property="run.test.jvmargs" value="--add-modules ${test.module.name} --add-reads ${test.module.name}=ALL-UNNAMED ${run.test.addexports.internal}">
+            <and>
+                <isset property="test.module.name"/>
+                <length length="0" string="${test.module.name}" when="greater"/>
+            </and>
+        </condition>
+    </target>
+    <target depends="-init-source-module-properties" name="-init-test-module-properties-without-module" unless="named.module.internal">
+        <property name="javac.test.sourcepath" value="${empty.dir}"/>
+        <property name="javac.test.compilerargs" value=""/>
+        <property name="run.test.jvmargs" value=""/>
+    </target>
+    <target depends="-init-test-javac-module-properties-with-module,-init-test-module-properties-without-module" name="-init-test-module-properties"/>
     <target if="do.depend.true" name="-compile-test-depend">
         <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
     </target>
-    <target depends="init,deps-jar,compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test">
-        <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" processorpath="${javac.test.processorpath}" srcdir="${test.src.dir}"/>
+    <target depends="init,deps-jar,compile,-init-test-module-properties,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test">
+        <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" modulepath="${javac.test.modulepath}" processorpath="${javac.test.processorpath}" sourcepath="${javac.test.sourcepath}" srcdir="${test.src.dir}">
+            <customize>
+                <compilerarg line="${javac.test.compilerargs}"/>
+            </customize>
+        </j2seproject3:javac>
         <copy todir="${build.test.classes.dir}">
             <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
         </copy>
@@ -1267,10 +1613,14 @@ is divided into following sections:
         <!-- Empty placeholder for easier customization. -->
         <!-- You can override this target in the ../build.xml file. -->
     </target>
-    <target depends="init,deps-jar,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
+    <target depends="init,deps-jar,compile,-init-test-module-properties,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
         <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
         <j2seproject3:force-recompile destdir="${build.test.classes.dir}"/>
-        <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" processorpath="${javac.test.processorpath}" sourcepath="${test.src.dir}" srcdir="${test.src.dir}"/>
+        <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}, module-info.java" modulepath="${javac.test.modulepath}" processorpath="${javac.test.processorpath}" sourcepath="${test.src.dir}" srcdir="${test.src.dir}">
+            <customize>
+                <compilerarg line="${javac.test.compilerargs}"/>
+            </customize>
+        </j2seproject3:javac>
         <copy todir="${build.test.classes.dir}">
             <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
         </copy>
@@ -1288,7 +1638,7 @@ is divided into following sections:
     <target depends="init" if="have.tests" name="-pre-test-run">
         <mkdir dir="${build.test.results.dir}"/>
     </target>
-    <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">
+    <target depends="init,compile-test,-init-test-run-module-properties,-pre-test-run" if="have.tests" name="-do-test-run">
         <j2seproject3:test includes="${includes}" testincludes="**/*Test.java"/>
     </target>
     <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
@@ -1300,14 +1650,14 @@ is divided into following sections:
     <target depends="init" if="have.tests" name="-pre-test-run-single">
         <mkdir dir="${build.test.results.dir}"/>
     </target>
-    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single">
+    <target depends="init,compile-test-single,-init-test-run-module-properties,-pre-test-run-single" if="have.tests" name="-do-test-run-single">
         <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
         <j2seproject3:test excludes="" includes="${test.includes}" testincludes="${test.includes}"/>
     </target>
     <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single">
         <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
     </target>
-    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
+    <target depends="init,compile-test-single,-init-test-run-module-properties,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
     <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single-method">
         <fail unless="test.class">Must select some files in the IDE or set test.class</fail>
         <fail unless="test.method">Must select some method in the IDE or set test.method</fail>
@@ -1316,7 +1666,7 @@ is divided into following sections:
     <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single-method" if="have.tests" name="-post-test-run-single-method">
         <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
     </target>
-    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single-method,-post-test-run-single-method" description="Run single unit test." name="test-single-method"/>
+    <target depends="init,compile-test-single,-init-test-run-module-properties,-pre-test-run-single,-do-test-run-single-method,-post-test-run-single-method" description="Run single unit test." name="test-single-method"/>
     <!--
                 =======================
                 TEST DEBUGGING SECTION
@@ -1334,8 +1684,8 @@ is divided into following sections:
     <target depends="init,compile-test" if="netbeans.home+have.tests" name="-debug-start-debugger-test">
         <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${test.class}"/>
     </target>
-    <target depends="init,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
-    <target depends="init,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test-method" name="debug-test-method"/>
+    <target depends="init,compile-test-single,-init-test-run-module-properties,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
+    <target depends="init,compile-test-single,-init-test-run-module-properties,-debug-start-debugger-test,-debug-start-debuggee-test-method" name="debug-test-method"/>
     <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test">
         <j2seproject1:nbjpdareload dir="${build.test.classes.dir}"/>
     </target>
@@ -1361,9 +1711,9 @@ is divided into following sections:
     <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-applet">
         <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
         <j2seproject3:debug classname="sun.applet.AppletViewer">
-            <customize>
+            <customizeDebuggee>
                 <arg value="${applet.url}"/>
-            </customize>
+            </customizeDebuggee>
         </j2seproject3:debug>
     </target>
     <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-applet" if="netbeans.home" name="debug-applet"/>
@@ -1390,6 +1740,7 @@ is divided into following sections:
     </target>
     <target depends="init" name="-do-clean">
         <delete dir="${build.dir}"/>
+        <delete dir="${dist.jlink.output}"/>
         <delete dir="${dist.dir}" followsymlinks="false" includeemptydirs="true"/>
     </target>
     <target name="-post-clean">
diff --git a/libsrc/cmykjpeg/nbproject/genfiles.properties b/libsrc/cmykjpeg/nbproject/genfiles.properties
index 1b65a7437..690913263 100644
--- a/libsrc/cmykjpeg/nbproject/genfiles.properties
+++ b/libsrc/cmykjpeg/nbproject/genfiles.properties
@@ -1,8 +1,8 @@
 build.xml.data.CRC32=73f9688e
 build.xml.script.CRC32=22af611f
-build.xml.stylesheet.CRC32=8064a381@1.75.2.48
+build.xml.stylesheet.CRC32=f85dc8f2@1.95.0.48
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
 nbproject/build-impl.xml.data.CRC32=73f9688e
-nbproject/build-impl.xml.script.CRC32=ce0b030d
-nbproject/build-impl.xml.stylesheet.CRC32=05530350@1.79.1.48
+nbproject/build-impl.xml.script.CRC32=216ac0db
+nbproject/build-impl.xml.stylesheet.CRC32=f89f7d21@1.95.0.48
diff --git a/libsrc/cmykjpeg/nbproject/project.properties b/libsrc/cmykjpeg/nbproject/project.properties
index e39fb97c5..424a2cdb5 100644
--- a/libsrc/cmykjpeg/nbproject/project.properties
+++ b/libsrc/cmykjpeg/nbproject/project.properties
@@ -19,8 +19,12 @@ build.test.results.dir=${build.dir}/test/results
 #debug.transport=dt_socket
 debug.classpath=\
     ${run.classpath}
+debug.modulepath=\
+    ${run.modulepath}
 debug.test.classpath=\
     ${run.test.classpath}
+debug.test.modulepath=\
+    ${run.test.modulepath}
 # Files in build.classes.dir which should be excluded from distribution jar
 dist.archive.excludes=
 # This directory is removed when the project is cleaned:
@@ -35,6 +39,8 @@ javac.classpath=
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.deprecation=false
+javac.modulepath=
+javac.processormodulepath=
 javac.processorpath=\
     ${javac.classpath}
 javac.source=1.8
@@ -42,6 +48,8 @@ javac.target=1.8
 javac.test.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}
+javac.test.modulepath=\
+    ${javac.modulepath}
 javac.test.processorpath=\
     ${javac.test.classpath}
 javadoc.additionalparam=
@@ -65,9 +73,13 @@ run.classpath=\
 # You may also define separate properties like run-sys-prop.name=value instead of -Dname=value.
 # To set system properties for unit tests define test-sys-prop.name=value:
 run.jvmargs=
+run.modulepath=\
+    ${javac.modulepath}
 run.test.classpath=\
     ${javac.test.classpath}:\
     ${build.test.classes.dir}
+run.test.modulepath=\
+    ${javac.test.modulepath}
 source.encoding=UTF-8
 src.dir=src
 test.src.dir=test
diff --git a/libsrc/cmykjpeg/src/org/monte/media/jpeg/CMYKJPEGImageReader.java b/libsrc/cmykjpeg/src/org/monte/media/jpeg/CMYKJPEGImageReader.java
index 206472bc4..7fb98b71f 100644
--- a/libsrc/cmykjpeg/src/org/monte/media/jpeg/CMYKJPEGImageReader.java
+++ b/libsrc/cmykjpeg/src/org/monte/media/jpeg/CMYKJPEGImageReader.java
@@ -210,8 +210,8 @@ public class CMYKJPEGImageReader extends ImageReader {
         if (numberOfComponentsInFrame != 4) {
             // Read image with YCC color encoding.
             in.seek(0);
-//            img = readImageFromYCCorGray(in);
-            img = readRGBImageFromYCC(new ImageInputStreamAdapter(in), null);
+            img = ImageIO.read(in); // JPEXS: It's not CMYK, then do Java do it's job
+            //img = readRGBImageFromYCC(new ImageInputStreamAdapter(in), null);
         } else if (numberOfComponentsInFrame == 4) {
 
             // Try to instantiate an ICC_Profile from the app2ICCProfile
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineBitsJPEG3Tag.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineBitsJPEG3Tag.java
index 02dd17fe6..2a4b71cf3 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineBitsJPEG3Tag.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineBitsJPEG3Tag.java
@@ -193,9 +193,14 @@ public class DefineBitsJPEG3Tag extends ImageTag implements AloneTag {
     protected SerializableImage getImage() {
         try {
             int errorLength = hasErrorHeader(imageData) ? 4 : 0;
-            ByteArrayInputStream bis = new ByteArrayInputStream(imageData.getArray(), imageData.getPos() + errorLength, imageData.getLength() - errorLength);
-
-            BufferedImage image = ImageHelper.read(bis);
+            JpegFixer jpegFixer = new JpegFixer();
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            try {
+                jpegFixer.fixJpeg(new ByteArrayInputStream(imageData.getArray(), imageData.getPos() + errorLength, imageData.getLength() - errorLength), baos);
+            } catch (IOException ex) {
+                Logger.getLogger(DefineBitsJPEG3Tag.class.getName()).log(Level.SEVERE, null, ex);
+            }
+            BufferedImage image = ImageHelper.read(new ByteArrayInputStream(baos.toByteArray()));
             if (image == null) {
                 Logger.getLogger(DefineBitsJPEG3Tag.class.getName()).log(Level.SEVERE, "Failed to load image");
                 return null;
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineBitsJPEG4Tag.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineBitsJPEG4Tag.java
index a605e1708..f694eecc4 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineBitsJPEG4Tag.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineBitsJPEG4Tag.java
@@ -197,7 +197,14 @@ public class DefineBitsJPEG4Tag extends ImageTag implements AloneTag {
     @Override
     protected SerializableImage getImage() {
         try {
-            BufferedImage image = ImageHelper.read(new ByteArrayInputStream(imageData.getArray(), imageData.getPos(), imageData.getLength()));
+            JpegFixer jpegFixer = new JpegFixer();
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            try {
+                jpegFixer.fixJpeg(new ByteArrayInputStream(imageData.getArray(), imageData.getPos(), imageData.getLength()), baos);
+            } catch (IOException ex) {
+                Logger.getLogger(DefineBitsJPEG3Tag.class.getName()).log(Level.SEVERE, null, ex);
+            }
+            BufferedImage image = ImageHelper.read(new ByteArrayInputStream(baos.toByteArray()));
             if (image == null) {
                 Logger.getLogger(DefineBitsJPEG4Tag.class.getName()).log(Level.SEVERE, "Failed to load image");
                 return null;