|
Michael Simacek |
f06e69 |
From 4711c34226d25055e5ba7975f7d8c0abdd2e74ed Mon Sep 17 00:00:00 2001
|
|
Michael Simacek |
2dd5bb |
From: Michael Simacek <msimacek@redhat.com>
|
|
Michael Simacek |
2dd5bb |
Date: Tue, 14 Jul 2015 16:56:49 +0200
|
|
Michael Simacek |
f06e69 |
Subject: [PATCH 2/6] Use sRGB.icc color profile from colord package
|
|
Tom Callaway |
12e6e5 |
|
|
Tom Callaway |
12e6e5 |
It's a replacement for non-free color profile shipped with fop
|
|
Tom Callaway |
12e6e5 |
---
|
|
Tom Callaway |
12e6e5 |
src/java/org/apache/fop/pdf/PDFICCBasedColorSpace.java | 9 ++++++++-
|
|
Tom Callaway |
12e6e5 |
1 file changed, 8 insertions(+), 1 deletion(-)
|
|
Tom Callaway |
12e6e5 |
|
|
Tom Callaway |
12e6e5 |
diff --git a/src/java/org/apache/fop/pdf/PDFICCBasedColorSpace.java b/src/java/org/apache/fop/pdf/PDFICCBasedColorSpace.java
|
|
Michael Simacek |
2dd5bb |
index 89a2c06..f0867a9 100644
|
|
Tom Callaway |
12e6e5 |
--- a/src/java/org/apache/fop/pdf/PDFICCBasedColorSpace.java
|
|
Tom Callaway |
12e6e5 |
+++ b/src/java/org/apache/fop/pdf/PDFICCBasedColorSpace.java
|
|
Michael Simacek |
2dd5bb |
@@ -22,7 +22,9 @@ package org.apache.fop.pdf;
|
|
Tom Callaway |
12e6e5 |
import java.awt.color.ColorSpace;
|
|
Tom Callaway |
12e6e5 |
import java.awt.color.ICC_Profile;
|
|
Tom Callaway |
12e6e5 |
import java.io.IOException;
|
|
Michael Simacek |
2dd5bb |
+import java.io.FileNotFoundException;
|
|
Tom Callaway |
12e6e5 |
import java.io.InputStream;
|
|
Tom Callaway |
12e6e5 |
+import java.io.FileInputStream;
|
|
Michael Simacek |
2dd5bb |
import java.util.Set;
|
|
Tom Callaway |
12e6e5 |
|
|
Tom Callaway |
12e6e5 |
import org.apache.commons.io.IOUtils;
|
|
Michael Simacek |
2dd5bb |
@@ -138,7 +140,12 @@ public class PDFICCBasedColorSpace extends PDFObject implements PDFColorSpace {
|
|
Tom Callaway |
12e6e5 |
public static PDFICCStream setupsRGBColorProfile(PDFDocument pdfDoc) {
|
|
Tom Callaway |
12e6e5 |
ICC_Profile profile;
|
|
Tom Callaway |
12e6e5 |
PDFICCStream sRGBProfile = pdfDoc.getFactory().makePDFICCStream();
|
|
Tom Callaway |
12e6e5 |
- InputStream in = PDFDocument.class.getResourceAsStream("sRGB Color Space Profile.icm");
|
|
Tom Callaway |
12e6e5 |
+ InputStream in;
|
|
Tom Callaway |
12e6e5 |
+ try {
|
|
Richard Hughes |
0c11a1 |
+ in = new FileInputStream("/usr/share/color/icc/colord/sRGB.icc");
|
|
Tom Callaway |
12e6e5 |
+ } catch (FileNotFoundException e) {
|
|
Tom Callaway |
12e6e5 |
+ in = null;
|
|
Tom Callaway |
12e6e5 |
+ }
|
|
Tom Callaway |
12e6e5 |
if (in != null) {
|
|
Tom Callaway |
12e6e5 |
try {
|
|
Tom Callaway |
12e6e5 |
profile = ColorProfileUtil.getICC_Profile(in);
|
|
Tom Callaway |
12e6e5 |
--
|
|
Michael Simacek |
f06e69 |
2.9.3
|
|
Tom Callaway |
12e6e5 |
|