[prev in list] [next in list] [prev in thread] [next in thread]
List: fop-cvs
Subject: svn commit: r897221 - in /xmlgraphics/fop/trunk: ./ lib/
From: cbowditch () apache ! org
Date: 2010-01-08 14:52:20
Message-ID: 20100108145221.1A05823889C5 () eris ! apache ! org
[Download RAW message or body]
Author: cbowditch
Date: Fri Jan 8 14:52:19 2010
New Revision: 897221
URL: http://svn.apache.org/viewvc?rev=897221&view=rev
Log:
Bugzilla #48237:
AFP Renderer does not respect image color settings for svg
Submitted by: Peter Hancock <peter.hancock.at.gmail.com>
Removed:
xmlgraphics/fop/trunk/src/java/org/apache/fop/util/CMYKColorSpace.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/util/ColorExt.java
Modified:
xmlgraphics/fop/trunk/lib/xmlgraphics-commons-1.4svn.jar
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPDataObjectFactory.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPPaintingState.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/goca/GraphicsSetProcessColor.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/GraphicsObject.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFColor.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFGraphics2D.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/util/ColorUtil.java
xmlgraphics/fop/trunk/status.xml
xmlgraphics/fop/trunk/test/java/org/apache/fop/traits/BorderPropsTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/util/ColorUtilTestCase.java
Modified: xmlgraphics/fop/trunk/lib/xmlgraphics-commons-1.4svn.jar
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/lib/xmlgraphics-commons-1.4svn.jar?rev=897221&r1=897220&r2=897221&view=diff
==============================================================================
Binary files - no diff available.
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPDataObjectFactory.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPDataObjectFactory.java?rev=897221&r1=897220&r2=897221&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPDataObjectFactory.java \
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPDataObjectFactory.java Fri \
Jan 8 14:52:19 2010 @@ -165,6 +165,9 @@
AFPGraphics2D g2d = graphicsObjectInfo.getGraphics2D();
g2d.setGraphicsObject(graphicsObj);
+ //set color converter (i.e. an rgb to grayscale converter)
+ graphicsObj.setColorConverter(g2d.getPaintingState().getColorConverter());
+
// paint to graphics object
Graphics2DImagePainter painter = graphicsObjectInfo.getPainter();
Rectangle2D area = graphicsObjectInfo.getArea();
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPPaintingState.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPPaintingState.java?rev=897221&r1=897220&r2=897221&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPPaintingState.java \
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPPaintingState.java Fri Jan \
8 14:52:19 2010 @@ -24,14 +24,19 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.xmlgraphics.java2d.ColorConverter;
+import org.apache.xmlgraphics.java2d.DefaultColorConverter;
+import org.apache.xmlgraphics.java2d.GrayScaleColorConverter;
+
import org.apache.fop.afp.fonts.AFPPageFonts;
import org.apache.fop.util.AbstractPaintingState;
/**
- * This keeps information about the current painting state when writing to an AFP \
datastream. + * This keeps information about the current painting state when writing \
to an + * AFP datastream.
*/
-public class AFPPaintingState extends org.apache.fop.util.AbstractPaintingState
-implements Cloneable {
+public class AFPPaintingState extends org.apache.fop.util.AbstractPaintingState \
implements + Cloneable {
private static final long serialVersionUID = 8206711712452344473L;
@@ -46,9 +51,18 @@
/** color image support */
private boolean colorImages = false;
- /** true if certain image formats may be embedded unchanged in their native \
format. */ + /** color image handler */
+ private ColorConverter colorConverter = GrayScaleColorConverter.getInstance();
+
+ /**
+ * true if certain image formats may be embedded unchanged in their native
+ * format.
+ */
private boolean nativeImagesSupported = false;
- /** true if CMYK images (requires IOCA FS45 suppport on the target platform) may \
be generated */ + /**
+ * true if CMYK images (requires IOCA FS45 suppport on the target platform)
+ * may be generated
+ */
private boolean cmykImagesSupported;
/** default value for image depth */
@@ -60,13 +74,12 @@
/** the current page */
private transient AFPPagePaintingState pagePaintingState = new \
AFPPagePaintingState();
-// /** reference orientation */
-// private int orientation = 0;
+ // /** reference orientation */
+ // private int orientation = 0;
/** a unit converter */
private final transient AFPUnitConverter unitConv = new AFPUnitConverter(this);
-
/**
* Sets the rotation to be used for portrait pages, valid values are 0
* (default), 90, 180, 270.
@@ -75,13 +88,11 @@
* The rotation in degrees.
*/
public void setPortraitRotation(int rotation) {
- if (rotation == 0 || rotation == 90 || rotation == 180
- || rotation == 270) {
+ if (rotation == 0 || rotation == 90 || rotation == 180 || rotation == 270) {
portraitRotation = rotation;
} else {
- throw new IllegalArgumentException(
- "The portrait rotation must be one"
- + " of the values 0, 90, 180, 270");
+ throw new IllegalArgumentException("The portrait rotation must be one"
+ + " of the values 0, 90, 180, 270");
}
}
@@ -103,13 +114,11 @@
* The rotation in degrees.
*/
public void setLandscapeRotation(int rotation) {
- if (rotation == 0 || rotation == 90 || rotation == 180
- || rotation == 270) {
+ if (rotation == 0 || rotation == 90 || rotation == 180 || rotation == 270) {
landscapeRotation = rotation;
} else {
- throw new IllegalArgumentException(
- "The landscape rotation must be one"
- + " of the values 0, 90, 180, 270");
+ throw new IllegalArgumentException("The landscape rotation must be one"
+ + " of the values 0, 90, 180, 270");
}
}
@@ -152,13 +161,18 @@
}
/**
- * Sets whether images are color or not
+ * Sets whether images are color or not and instantiates a ColorHandler
*
* @param colorImages
* color image output
*/
public void setColorImages(boolean colorImages) {
this.colorImages = colorImages;
+
+ if (colorImages) {
+ this.colorConverter = DefaultColorConverter.getInstance();
+ }
+
}
/**
@@ -171,9 +185,19 @@
}
/**
+ * Used to convert color in respect of the colorImages flag
+ *
+ * @return the color converter
+ */
+ public ColorConverter getColorConverter() {
+ return this.colorConverter;
+ }
+
+ /**
* Sets whether images are natively supported or not in the AFP environment
*
- * @param nativeImagesSupported true if images are natively supported in this \
AFP environment + * @param nativeImagesSupported
+ * true if images are natively supported in this AFP environment
*/
public void setNativeImagesSupported(boolean nativeImagesSupported) {
this.nativeImagesSupported = nativeImagesSupported;
@@ -189,10 +213,12 @@
}
/**
- * Controls whether CMYK images (IOCA FS45) are enabled. By default, support is \
disabled
- * for wider compatibility. When disabled, any CMYK image is converted to the \
selected
- * color format.
- * @param value true to enabled CMYK images
+ * Controls whether CMYK images (IOCA FS45) are enabled. By default, support
+ * is disabled for wider compatibility. When disabled, any CMYK image is
+ * converted to the selected color format.
+ *
+ * @param value
+ * true to enabled CMYK images
*/
public void setCMYKImagesSupported(boolean value) {
this.cmykImagesSupported = value;
@@ -200,6 +226,7 @@
/**
* Indicates whether CMYK images (IOCA FS45) are enabled.
+ *
* @return true if IOCA FS45 is enabled
*/
public boolean isCMYKImagesSupported() {
@@ -259,7 +286,8 @@
/**
* Sets the page width
*
- * @param pageWidth the page width
+ * @param pageWidth
+ * the page width
*/
public void setPageWidth(int pageWidth) {
pagePaintingState.setWidth(pageWidth);
@@ -277,7 +305,8 @@
/**
* Sets the page height
*
- * @param pageHeight the page height
+ * @param pageHeight
+ * the page height
*/
public void setPageHeight(int pageHeight) {
pagePaintingState.setHeight(pageHeight);
@@ -304,10 +333,11 @@
/**
* Sets the uri of the current image
*
- * @param uri the uri of the current image
+ * @param uri
+ * the uri of the current image
*/
public void setImageUri(String uri) {
- ((AFPData)getData()).imageUri = uri;
+ ((AFPData) getData()).imageUri = uri;
}
/**
@@ -316,7 +346,7 @@
* @return the uri of the current image
*/
public String getImageUri() {
- return ((AFPData)getData()).imageUri;
+ return ((AFPData) getData()).imageUri;
}
/**
@@ -338,10 +368,13 @@
}
/**
- * Returns a point on the current page, taking the current painting state into \
account. + * Returns a point on the current page, taking the current painting \
state + * into account.
*
- * @param x the X-coordinate
- * @param y the Y-coordinate
+ * @param x
+ * the X-coordinate
+ * @param y
+ * the Y-coordinate
* @return a point on the current page
*/
public Point getPoint(int x, int y) {
@@ -370,12 +403,13 @@
/** {@inheritDoc} */
public Object clone() {
- AFPPaintingState paintingState = (AFPPaintingState)super.clone();
- paintingState.pagePaintingState = \
(AFPPagePaintingState)this.pagePaintingState.clone(); + AFPPaintingState \
paintingState = (AFPPaintingState) super.clone(); + \
paintingState.pagePaintingState = (AFPPagePaintingState) \
this.pagePaintingState.clone(); paintingState.portraitRotation = \
this.portraitRotation; paintingState.landscapeRotation = this.landscapeRotation;
paintingState.bitsPerPixel = this.bitsPerPixel;
paintingState.colorImages = this.colorImages;
+ paintingState.colorConverter = this.colorConverter;
paintingState.resolution = this.resolution;
return paintingState;
}
@@ -383,13 +417,9 @@
/** {@inheritDoc} */
public String toString() {
return "AFPPaintingState{" + "portraitRotation=" + portraitRotation
- + ", landscapeRotation=" + landscapeRotation
- + ", colorImages=" + colorImages
- + ", bitsPerPixel=" + bitsPerPixel
- + ", resolution=" + resolution
- + ", pageState=" + pagePaintingState
- + super.toString()
- + "}";
+ + ", landscapeRotation=" + landscapeRotation + ", colorImages=" + \
colorImages + + ", bitsPerPixel=" + bitsPerPixel + ", resolution=" + \
resolution + ", pageState=" + + pagePaintingState + super.toString() + \
"}"; }
/**
@@ -423,7 +453,8 @@
/**
* Sets the page width
*
- * @param width the page width
+ * @param width
+ * the page width
*/
protected void setWidth(int width) {
this.width = width;
@@ -441,7 +472,8 @@
/**
* Sets the page height
*
- * @param height the page height
+ * @param height
+ * the page height
*/
protected void setHeight(int height) {
this.height = height;
@@ -459,7 +491,8 @@
/**
* Sets the current page fonts
*
- * @param fonts the current page fonts
+ * @param fonts
+ * the current page fonts
*/
protected void setFonts(AFPPageFonts fonts) {
this.fonts = fonts;
@@ -486,7 +519,8 @@
/**
* Sets the current page orientation
*
- * @param orientation the current page orientation
+ * @param orientation
+ * the current page orientation
*/
protected void setOrientation(int orientation) {
this.orientation = orientation;
@@ -505,12 +539,8 @@
/** {@inheritDoc} */
public String toString() {
- return "AFPPagePaintingState{width=" + width
- + ", height=" + height
- + ", orientation=" + orientation
- + ", fonts=" + fonts
- + ", fontCount=" + fontCount
- + "}";
+ return "AFPPagePaintingState{width=" + width + ", height=" + height + ", \
orientation=" + + orientation + ", fonts=" + fonts + ", \
fontCount=" + fontCount + "}"; }
}
@@ -527,7 +557,7 @@
/** {@inheritDoc} */
public Object clone() {
- AFPData obj = (AFPData)super.clone();
+ AFPData obj = (AFPData) super.clone();
obj.filled = this.filled;
obj.imageUri = this.imageUri;
return obj;
@@ -535,10 +565,8 @@
/** {@inheritDoc} */
public String toString() {
- return "AFPData{" + super.toString()
- + ", filled=" + filled
- + ", imageUri=" + imageUri
- + "}";
+ return "AFPData{" + super.toString() + ", filled=" + filled + ", \
imageUri=" + imageUri + + "}";
}
/** {@inheritDoc} */
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/goca/GraphicsSetProcessColor.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/goca/GraphicsSetProcessColor.java?rev=897221&r1=897220&r2=897221&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/goca/GraphicsSetProcessColor.java \
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/goca/GraphicsSetProcessColor.java \
Fri Jan 8 14:52:19 2010 @@ -29,6 +29,16 @@
*/
public class GraphicsSetProcessColor extends AbstractGraphicsDrawingOrder {
+ /*
+ * GOCA Color space support:
+ * X'01' RGB
+ * X'04' CMYK
+ * X'06' Highlight color space
+ * X'08' CIELAB
+ * X'40' Standard OCA color space
+ */
+ private static final byte RGB = 0x01, CMYK = 0x04;
+
private final Color color;
private final float[] colorComponents;
@@ -36,7 +46,8 @@
/**
* Main constructor
*
- * @param color the color to set
+ * @param color
+ * the color to set
*/
public GraphicsSetProcessColor(Color color) {
this.color = color;
@@ -50,7 +61,7 @@
/** {@inheritDoc} */
byte getOrderCode() {
- return (byte)0xB2;
+ return (byte) 0xB2;
}
/** {@inheritDoc} */
@@ -60,24 +71,24 @@
byte colspace;
int colSpaceType = color.getColorSpace().getType();
if (colSpaceType == ColorSpace.TYPE_CMYK) {
- colspace = 0x04;
+ colspace = CMYK;
} else if (colSpaceType == ColorSpace.TYPE_RGB) {
- colspace = 0x01;
+ colspace = RGB;
} else {
log.error("unsupported colorspace " + colSpaceType);
- colspace = 0x01;
+ colspace = RGB;
}
// COLSIZE(S)
byte[] colsizes = new byte[] {0x00, 0x00, 0x00, 0x00};
for (int i = 0; i < colorComponents.length; i++) {
- colsizes[i] = (byte)8;
+ colsizes[i] = (byte) 8;
}
int len = getDataLength();
byte[] data = new byte[len];
data[0] = getOrderCode(); // GSPCOL order code
- data[1] = (byte)(len - 2); // LEN
+ data[1] = (byte) (len - 2); // LEN
data[2] = 0x00; // reserved; must be zero
data[3] = colspace; // COLSPCE
data[4] = 0x00; // reserved; must be zero
@@ -91,7 +102,7 @@
// COLVALUE(S)
for (int i = 0; i < colorComponents.length; i++) {
- data[i + 12] = (byte)(colorComponents[i] * 255);
+ data[i + 12] = (byte) (colorComponents[i] * 255);
}
os.write(data);
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/GraphicsObject.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/GraphicsObject.java?rev=897221&r1=897220&r2=897221&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/GraphicsObject.java \
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/GraphicsObject.java Fri \
Jan 8 14:52:19 2010 @@ -25,6 +25,8 @@
import java.util.Iterator;
import java.util.List;
+import org.apache.xmlgraphics.java2d.ColorConverter;
+
import org.apache.fop.afp.AFPDataObjectInfo;
import org.apache.fop.afp.AFPObjectAreaInfo;
import org.apache.fop.afp.Completable;
@@ -65,6 +67,10 @@
/** the graphics state */
private final GraphicsState graphicsState = new GraphicsState();
+
+ /** color converter */
+ private ColorConverter colorConverter = null;
+
/**
* Default constructor
*
@@ -140,11 +146,23 @@
*/
public void setColor(Color color) {
if (!color.equals(graphicsState.color)) {
- addObject(new GraphicsSetProcessColor(color));
+ addObject(new GraphicsSetProcessColor(colorConverter.convert(color)));
graphicsState.color = color;
}
}
+
+ /**
+ * Sets the color converter
+ *
+ * @param colorConverter ColorConverter to filter the color
+ * when creating a GraphicsSetProcessColor.
+ */
+ public void setColorConverter(ColorConverter colorConverter) {
+ this.colorConverter = colorConverter;
+ }
+
+
/**
* Sets the current position
*
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFColor.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFColor.java?rev=897221&r1=897220&r2=897221&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFColor.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFColor.java Fri Jan 8 \
14:52:19 2010 @@ -23,11 +23,11 @@
import java.awt.color.ColorSpace;
import java.awt.color.ICC_ColorSpace;
import java.io.IOException;
-import java.util.List;
import java.util.ArrayList;
+import java.util.List;
-import org.apache.fop.util.CMYKColorSpace;
-import org.apache.fop.util.ColorExt;
+import org.apache.xmlgraphics.java2d.CMYKColorSpace;
+import org.apache.xmlgraphics.java2d.ColorExt;
/**
* PDF Color object.
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFGraphics2D.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFGraphics2D.java?rev=897221&r1=897220&r2=897221&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFGraphics2D.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFGraphics2D.java Fri Jan 8 \
14:52:19 2010 @@ -66,6 +66,7 @@
import org.apache.xmlgraphics.image.loader.impl.ImageRawJPEG;
import org.apache.xmlgraphics.image.loader.impl.ImageRendered;
import org.apache.xmlgraphics.java2d.AbstractGraphics2D;
+import org.apache.xmlgraphics.java2d.ColorExt;
import org.apache.xmlgraphics.java2d.GraphicContext;
import org.apache.fop.fonts.Font;
@@ -91,7 +92,6 @@
import org.apache.fop.render.pdf.ImageRawCCITTFaxAdapter;
import org.apache.fop.render.pdf.ImageRawJPEGAdapter;
import org.apache.fop.render.pdf.ImageRenderedAdapter;
-import org.apache.fop.util.ColorExt;
/**
* PDF Graphics 2D.
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/util/ColorUtil.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/util/ColorUtil.java?rev=897221&r1=897220&r2=897221&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/util/ColorUtil.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/util/ColorUtil.java Fri Jan 8 \
14:52:19 2010 @@ -27,6 +27,9 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.xmlgraphics.java2d.CMYKColorSpace;
+import org.apache.xmlgraphics.java2d.ColorExt;
+
import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.fo.expr.PropertyException;
@@ -679,20 +682,7 @@
* @return the modified color
*/
public static Color lightenColor(Color col, float factor) {
- // TODO: This function converts the color into the sRGB namespace.
- // This should be avoided if possible.
- float[] cols = new float[4];
- cols = col.getRGBComponents(cols);
- if (factor > 0) {
- cols[0] += (1.0 - cols[0]) * factor;
- cols[1] += (1.0 - cols[1]) * factor;
- cols[2] += (1.0 - cols[2]) * factor;
- } else {
- cols[0] -= cols[0] * -factor;
- cols[1] -= cols[1] * -factor;
- cols[2] -= cols[2] * -factor;
- }
- return new Color(cols[0], cols[1], cols[2], cols[3]);
+ return org.apache.xmlgraphics.java2d.ColorUtil.lightenColor(col, factor);
}
/**
@@ -711,7 +701,7 @@
* @return true if it is a gray value
*/
public static boolean isGray(Color col) {
- return (col.getRed() == col.getBlue() && col.getRed() == col.getGreen());
+ return org.apache.xmlgraphics.java2d.ColorUtil.isGray(col);
}
/**
@@ -720,10 +710,7 @@
* @return the CMYK color
*/
public static Color toCMYKGrayColor(float black) {
- float[] cmyk = new float[] {0f, 0f, 0f, 1.0f - black};
- CMYKColorSpace cmykCs = CMYKColorSpace.getInstance();
- float[] rgb = cmykCs.toRGB(cmyk);
- return ColorExt.createFromFoRgbIcc(rgb[0], rgb[1], rgb[2],
- CMYK_PSEUDO_PROFILE, null, cmykCs, cmyk);
+
+ return org.apache.xmlgraphics.java2d.ColorUtil.toCMYKGrayColor(black);
}
}
Modified: xmlgraphics/fop/trunk/status.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/status.xml?rev=897221&r1=897220&r2=897221&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/status.xml (original)
+++ xmlgraphics/fop/trunk/status.xml Fri Jan 8 14:52:19 2010
@@ -58,7 +58,10 @@
documents. Example: the fix of marks layering will be such a case when it's \
done.
-->
<release version="FOP Trunk" date="TBD">
- <action context="Renderers" dev="CB" type="fix" fixes-bug="48376" \
due-to="Venkat Reddy"> + <action context="Renderers" dev="CB" type="fix" \
fixes-bug="48237" due-to="Peter Hancock"> + Bugfix: AFP Renderer: Respect \
image color settings for svg + </action>
+ <action context="Renderers" dev="CB" type="fix" fixes-bug="48376" due-to="Venkat \
Reddy">
Bugfix: AFP Renderer: Page Overlays not generated when using Intermediate \
Format </action>
<action context="Renderers" dev="CB" type="fix" fixes-bug="48456">
Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/traits/BorderPropsTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/traits/BorderPropsTestCase.java?rev=897221&r1=897220&r2=897221&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/traits/BorderPropsTestCase.java \
(original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/traits/BorderPropsTestCase.java \
Fri Jan 8 14:52:19 2010 @@ -23,9 +23,10 @@
import junit.framework.TestCase;
+import org.apache.xmlgraphics.java2d.CMYKColorSpace;
+import org.apache.xmlgraphics.java2d.ColorExt;
+
import org.apache.fop.fo.Constants;
-import org.apache.fop.util.CMYKColorSpace;
-import org.apache.fop.util.ColorExt;
import org.apache.fop.util.ColorUtil;
/**
Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/util/ColorUtilTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/util/ColorUtilTestCase.java?rev=897221&r1=897220&r2=897221&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/util/ColorUtilTestCase.java \
(original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/util/ColorUtilTestCase.java Fri \
Jan 8 14:52:19 2010 @@ -24,6 +24,9 @@
import junit.framework.TestCase;
+import org.apache.xmlgraphics.java2d.CMYKColorSpace;
+import org.apache.xmlgraphics.java2d.ColorExt;
+
import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.apps.FopFactory;
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic