rpms/batik
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix imageio codec lookup

Browse Source 
- Add jai-imageio-core on rasterizer's classpath
This commit is contained in:
Michael Simacek 2015-11-27 15:43:55 +01:00
parent d756e5ef66
commit a50088c755
3 changed files with 48 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
batik-fix-codec-lookup.patch Normal file
View File

@ -0,0 +1,39 @@
From d4151ffc387e52f77f94115fd655224193cec1fd Mon Sep 17 00:00:00 2001
From: Michael Simacek <msimacek@redhat.com>
Date: Fri, 27 Nov 2015 15:35:57 +0100
Subject: [PATCH] Fix imageio codec lookup
---
sources/org/apache/batik/transcoder/image/PNGTranscoder.java | 2 +-
sources/org/apache/batik/transcoder/image/TIFFTranscoder.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sources/org/apache/batik/transcoder/image/PNGTranscoder.java b/sources/org/apache/batik/transcoder/image/PNGTranscoder.java
index c03622a..4429843 100644
--- a/sources/org/apache/batik/transcoder/image/PNGTranscoder.java
+++ b/sources/org/apache/batik/transcoder/image/PNGTranscoder.java
@@ -111,7 +111,7 @@ public class PNGTranscoder extends ImageTranscoder {
"org.apache.batik.ext.awt.image.codec.png.PNGTranscoderInternalCodecWriteAdapter");
if (adapter == null) {
adapter = getWriteAdapter(
- "org.apache.batik.transcoder.image.PNGTranscoderImageIOWriteAdapter");
+ "org.apache.batik.ext.awt.image.codec.imageio.PNGTranscoderImageIOWriteAdapter");
}
if (adapter == null) {
throw new TranscoderException(
diff --git a/sources/org/apache/batik/transcoder/image/TIFFTranscoder.java b/sources/org/apache/batik/transcoder/image/TIFFTranscoder.java
index d086e82..fce7d6c 100644
--- a/sources/org/apache/batik/transcoder/image/TIFFTranscoder.java
+++ b/sources/org/apache/batik/transcoder/image/TIFFTranscoder.java
@@ -104,7 +104,7 @@ public class TIFFTranscoder extends ImageTranscoder {
"org.apache.batik.ext.awt.image.codec.tiff.TIFFTranscoderInternalCodecWriteAdapter");
if (adapter == null) {
adapter = getWriteAdapter(
- "org.apache.batik.transcoder.image.TIFFTranscoderImageIOWriteAdapter");
+ "org.apache.batik.ext.awt.image.codec.imageio.TIFFTranscoderImageIOWriteAdapter");
}
if (adapter == null) {
throw new TranscoderException(
--
2.5.0

2
batik.rasterizer.script
View File

@ -23,7 +23,7 @@ fi
# Configuration
MAIN_CLASS=org.apache.batik.apps.rasterizer.Main
BASE_JARS="batik-rasterizer.jar batik-all.jar xml-commons-apis-ext.jar xmlgraphics-commons.jar"
BASE_JARS="batik-rasterizer.jar batik-all.jar xml-commons-apis-ext.jar xmlgraphics-commons.jar jai_imageio.jar"
# Set parameters
set_jvm

9
batik.spec
View File

@ -1,6 +1,6 @@
Name: batik
Version: 1.8
Release: 3%{?dist}
Release: 4%{?dist}
Summary: Scalable Vector Graphics for Java
License: ASL 2.0 and W3C
URL: http://xml.apache.org/batik/
@ -37,6 +37,8 @@ Patch3: %{name}-javadoc-task-failonerror-and-oom.patch
Patch4: %{name}-disable-doclint.patch
Patch5: %{name}-fix-codec-lookup.patch
BuildArch: noarch
BuildRequires: java-devel >= 1:1.6.0
@ -172,6 +174,7 @@ done
#%patch3
%patch4
%patch5 -p1
rm -fr sources/org/apache/batik/ext/awt/image/codec/tiff
@ -329,6 +332,10 @@ chmod +x $RPM_BUILD_ROOT%{_datadir}/%{name}/contrib/charts/convert.sh
%changelog
* Fri Nov 27 2015 Michael Simacek <msimacek@redhat.com> - 1.8-4
- Fix imageio codec lookup
- Add jai-imageio-core on rasterizer's classpath
* Fri Nov 27 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.8-3
- Use custom security policy files
- Fix rasterizer and squiggle classpath