css: remove dependency on xmlgraphics-commons

See #106, #107.
css4j · Jul 9, 2024 · 8d22582 · 8d22582
1 parent ce82f20
commit 8d22582
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 11 deletions.
diff --git a/echosvg-css/build.gradle b/echosvg-css/build.gradle
@@ -1,22 +1,15 @@
 plugins {
 	id 'echosvg.java-conventions'
-	id 'org.gradlex.extra-java-module-info'
 }
 
 dependencies {
 	api project(':echosvg-util')
 	api "io.sf.carte:svgom-api:${svgomVersion}"
-	api "org.apache.xmlgraphics:xmlgraphics-commons:${xmlgraphicsCommonsVersion}"
 	api "io.sf.carte:css4j:${css4jVersion}"
 	testImplementation "org.junit.jupiter:junit-jupiter:${junitVersion}"
 	testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 }
 
-extraJavaModuleInfo {
-	failOnMissingModuleInfo.set(false)
-	automaticModule('org.apache.xmlgraphics:xmlgraphics-commons', 'org.apache.xmlgraphics.commons')
-}
-
 test {
 	useJUnitPlatform()
 }

diff --git a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg12/AbstractCIEColor.java b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg12/AbstractCIEColor.java
@@ -18,7 +18,6 @@
  */
 package io.sf.carte.echosvg.css.engine.value.svg12;
 
-import org.apache.xmlgraphics.java2d.color.ColorSpaces;
 import org.w3c.dom.css.CSSValue;
 
 import io.sf.carte.echosvg.css.engine.value.AbstractValue;
@@ -34,8 +33,13 @@ public abstract class AbstractCIEColor extends AbstractValue {
 	/** The three color values. */
 	protected float[] values = new float[3];
 
-	/** The white point, initialized to D50. */
-	protected float[] whitepoint = ColorSpaces.getCIELabColorSpaceD50().getWhitePoint();
+	/**
+	 * The white point in XYZ coordinates, initialized to D50.
+	 * <p>
+	 * Data from CIE Publication 15.2 - 1986 Page 55 Table 1.4.
+	 * </p>
+	 */
+	protected float[] whitepoint = new float[] {96.42f, 100f, 82.49f};
 
 	/**
 	 * Creates a new CIE-based color.

diff --git a/echosvg-css/src/main/java/module-info.java b/echosvg-css/src/main/java/module-info.java
@@ -33,5 +33,4 @@
 	requires java.xml;
 	requires jdk.xml.dom;
 	requires transitive org.w3c.dom.svg;
-	requires org.apache.xmlgraphics.commons;
 }