aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremias Maerki <jeremias@apache.org>2011-02-10 15:22:00 +0000
committerJeremias Maerki <jeremias@apache.org>2011-02-10 15:22:00 +0000
commit1c11bf98135675a9d6b6acac4fd7856a5dde8751 (patch)
tree8a76e0437cb4126fb741f01377c1190b0c3d4f7e
parent23140d8190e68c6e913d5cc7382c438f9f58f0fa (diff)
downloadxmlgraphics-fop-1c11bf98135675a9d6b6acac4fd7856a5dde8751.tar.gz
xmlgraphics-fop-1c11bf98135675a9d6b6acac4fd7856a5dde8751.zip
Fix deprecation.Temp_Color
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_Color@1069423 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--src/java/org/apache/fop/pdf/PDFColorHandler.java12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/java/org/apache/fop/pdf/PDFColorHandler.java b/src/java/org/apache/fop/pdf/PDFColorHandler.java
index fb5a0ba12..76a6cab78 100644
--- a/src/java/org/apache/fop/pdf/PDFColorHandler.java
+++ b/src/java/org/apache/fop/pdf/PDFColorHandler.java
@@ -30,12 +30,12 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.xmlgraphics.java2d.color.CIELabColorSpace;
-import org.apache.xmlgraphics.java2d.color.ColorWithAlternatives;
import org.apache.xmlgraphics.java2d.color.ColorUtil;
+import org.apache.xmlgraphics.java2d.color.ColorWithAlternatives;
import org.apache.xmlgraphics.java2d.color.DeviceCMYKColorSpace;
import org.apache.xmlgraphics.java2d.color.NamedColorSpace;
+import org.apache.xmlgraphics.java2d.color.profile.ColorProfileUtil;
-import org.apache.fop.util.ColorProfileUtil;
import org.apache.fop.util.DecimalFormatCache;
/**
@@ -48,7 +48,7 @@ public class PDFColorHandler {
private PDFResources resources;
- private Map cieLabColorSpaces;
+ private Map<String, PDFCIELabColorSpace> cieLabColorSpaces;
public PDFColorHandler(PDFResources resources) {
this.resources = resources;
@@ -149,10 +149,10 @@ public class PDFColorHandler {
private PDFCIELabColorSpace getCIELabColorSpace(CIELabColorSpace labCS) {
if (this.cieLabColorSpaces == null) {
- this.cieLabColorSpaces = new java.util.HashMap();
+ this.cieLabColorSpaces = new java.util.HashMap<String, PDFCIELabColorSpace>();
}
float[] wp = labCS.getWhitePoint();
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
for (int i = 0; i < 3; i++) {
if (i > 0) {
sb.append(',');
@@ -160,7 +160,7 @@ public class PDFColorHandler {
sb.append(wp[i]);
}
String key = sb.toString();
- PDFCIELabColorSpace cielab = (PDFCIELabColorSpace)this.cieLabColorSpaces.get(key);
+ PDFCIELabColorSpace cielab = this.cieLabColorSpaces.get(key);
if (cielab == null) {
//color space is not in the PDF, yet
float[] wp1 = new float[] {wp[0] / 100f, wp[1] / 100f, wp[2] / 100f};