for generic FOP image processing (i.e. not related to rendering), use java.awt.Color instead of pdf.PDFColor

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@196874 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 13 insertions, 13 deletions

diff --git a/src/java/org/apache/fop/image/JimiImage.java b/src/java/org/apache/fop/image/JimiImage.java
index d39c2a601..417ccb40d 100644
--- a/src/java/org/apache/fop/image/JimiImage.java
+++ b/src/java/org/apache/fop/image/JimiImage.java
@@ -3,34 +3,34 @@
  * ============================================================================
  *                    The Apache Software License, Version 1.1
  * ============================================================================
- * 
+ *
  * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without modifica-
  * tion, are permitted provided that the following conditions are met:
- * 
+ *
  * 1. Redistributions of source code must retain the above copyright notice,
  *    this list of conditions and the following disclaimer.
- * 
+ *
  * 2. Redistributions in binary form must reproduce the above copyright notice,
  *    this list of conditions and the following disclaimer in the documentation
  *    and/or other materials provided with the distribution.
- * 
+ *
  * 3. The end-user documentation included with the redistribution, if any, must
  *    include the following acknowledgment: "This product includes software
  *    developed by the Apache Software Foundation (http://www.apache.org/)."
  *    Alternately, this acknowledgment may appear in the software itself, if
  *    and wherever such third-party acknowledgments normally appear.
- * 
+ *
  * 4. The names "FOP" and "Apache Software Foundation" must not be used to
  *    endorse or promote products derived from this software without prior
  *    written permission. For written permission, please contact
  *    apache@apache.org.
- * 
+ *
  * 5. Products derived from this software may not be called "Apache", nor may
  *    "Apache" appear in their name, without prior written permission of the
  *    Apache Software Foundation.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
  * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
  * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
@@ -42,12 +42,12 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * ============================================================================
- * 
+ *
  * This software consists of voluntary contributions made by many individuals
  * on behalf of the Apache Software Foundation and was originally created by
  * James Tauber <jtauber@jtauber.com>. For more information on the Apache
  * Software Foundation, please see <http://www.apache.org/>.
- */ 
+ */
 package org.apache.fop.image;
 
 // Java
@@ -55,6 +55,7 @@ import java.awt.image.ImageProducer;
 import java.awt.image.ColorModel;
 import java.awt.image.IndexColorModel;
 import java.awt.color.ColorSpace;
+import java.awt.Color;
 
 // Jimi
 import com.sun.jimi.core.Jimi;
@@ -63,7 +64,6 @@ import com.sun.jimi.core.Jimi;
 import org.apache.avalon.framework.logger.Logger;
 
 // FOP
-import org.apache.fop.pdf.PDFColor;
 import org.apache.fop.apps.FOUserAgent;
 
 /**
@@ -157,7 +157,7 @@ public class JimiImage extends AbstractFopImage {
                                 i++) {
                             if ((alphas[i] & 0xFF) == 0) {
                                 this.isTransparent = true;
-                                this.transparentColor = new PDFColor(
+                                this.transparentColor = new Color(
                                                             (int)(reds[i] & 0xFF),
                                                             (int)(greens[i] & 0xFF),
                                                             (int)(blues[i] & 0xFF));
@@ -171,7 +171,7 @@ public class JimiImage extends AbstractFopImage {
                          * for (int i = 0; i < this.width * this.height; i++) {
                          * if (cm.getAlpha(tmpMap[i]) == 0) {
                          * this.isTransparent = true;
-                         * this.transparentColor = new PDFColor(cm.getRed(tmpMap[i]), 
+                         * this.transparentColor = new PDFColor(cm.getRed(tmpMap[i]),
                          *      cm.getGreen(tmpMap[i]), cm.getBlue(tmpMap[i]));
                          * break;
                          * }