You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ti...@apache.org on 2019/09/29 09:22:48 UTC
svn commit: r1867710 -
/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDICCBased.java
Author: tilman
Date: Sun Sep 29 09:22:48 2019
New Revision: 1867710
URL: http://svn.apache.org/viewvc?rev=1867710&view=rev
Log:
PDFBOX-4659: remove jdk7 assumptions because we're on jdk8
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDICCBased.java
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDICCBased.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDICCBased.java?rev=1867710&r1=1867709&r2=1867710&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDICCBased.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDICCBased.java Sun Sep 29 09:22:48 2019
@@ -31,7 +31,6 @@ import java.io.IOException;
import java.io.InputStream;
import java.util.Arrays;
import java.util.List;
-import java.util.StringTokenizer;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.pdfbox.cos.COSArray;
@@ -75,12 +74,7 @@ public final class PDICCBased extends PD
{
String cmmProperty = System.getProperty("sun.java2d.cmm");
boolean result = false;
- if (!isMinJdk8())
- {
- // always KCMS but class has different name
- result = true;
- }
- else if ("sun.java2d.cmm.kcms.KcmsServiceProvider".equals(cmmProperty))
+ if ("sun.java2d.cmm.kcms.KcmsServiceProvider".equals(cmmProperty))
{
try
{
@@ -559,26 +553,4 @@ public final class PDICCBased extends PD
{
return getName() + "{numberOfComponents: " + getNumberOfComponents() + "}";
}
-
- private static boolean isMinJdk8()
- {
- // strategy from lucene-solr/lucene/core/src/java/org/apache/lucene/util/Constants.java
- String version = System.getProperty("java.specification.version");
- final StringTokenizer st = new StringTokenizer(version, ".");
- try
- {
- int major = Integer.parseInt(st.nextToken());
- int minor = 0;
- if (st.hasMoreTokens())
- {
- minor = Integer.parseInt(st.nextToken());
- }
- return major > 1 || (major == 1 && minor >= 8);
- }
- catch (NumberFormatException nfe)
- {
- // maybe some new numbering scheme in the 22nd century
- return true;
- }
- }
}