Add support for JPEG2000 (#1169)

* Add support for JPEG2000 Closes #1168
qzind · Aug 23, 2023 · 52cd71d · 52cd71d
1 parent a1a2e7c
commit 52cd71d
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/build.xml b/build.xml
@@ -168,7 +168,7 @@
             </fileset>
         </delete>
 
-        <!-- Merge META-INF/services from PDFBOX and TwelveMonkeys -->
+        <!-- Merge META-INF/services from PDFBOX, jpeg2000 and TwelveMonkeys -->
         <!-- find the TwelveMonkeys jar -->
         <path id="imageio-jpeg.found">
             <first>
@@ -178,10 +178,22 @@
             </first>
         </path>
         <pathconvert property="imageio-jpeg.path" refid="imageio-jpeg.found"/>
+
+        <!-- find the jpeg2000 jar -->
+        <path id="imageio-jpeg2000.found">
+            <first>
+                <fileset dir="lib/imaging/">
+                    <include name="jai-imageio-jpeg2000*.jar"/>
+                </fileset>
+            </first>
+        </path>
+        <pathconvert property="imageio-jpeg2000.path" refid="imageio-jpeg2000.found"/>
+
         <!-- merge service entries for ImageReaderSpi -->
         <concat destfile="${out.dir}/libs-temp/META-INF/services/javax.imageio.spi.ImageReaderSpi" fixlastline="true">
             <zipentry zipfile="${pdfbox.path}" name="META-INF/services/javax.imageio.spi.ImageReaderSpi"/>
             <zipentry zipfile="${imageio-jpeg.path}" name="META-INF/services/javax.imageio.spi.ImageReaderSpi"/>
+            <zipentry zipfile="${imageio-jpeg2000.path}" name="META-INF/services/javax.imageio.spi.ImageReaderSpi"/>
         </concat>
     </target>
 

diff --git a/lib/imaging/jai-imageio-core-1.4.0.jar b/lib/imaging/jai-imageio-core-1.4.0.jar
diff --git a/lib/imaging/jai-imageio-jpeg2000-1.4.0.jar b/lib/imaging/jai-imageio-jpeg2000-1.4.0.jar