From d6c4cc1b3627cff19badd917037907164d75cc4e Mon Sep 17 00:00:00 2001 From: carlosame Date: Tue, 30 Jul 2024 18:19:16 +0200 Subject: [PATCH] Initial commit --- .editorconfig | 19 + .gitattributes | 14 + .github/workflows/build.yml | 61 ++++ .github/workflows/gradle-publish.yml | 34 ++ .gitignore | 11 + DeveloperCertificateOfOrigin.txt | 38 ++ LICENSE | 201 +++++++++++ NOTICE | 7 + README.md | 94 +++++ build.gradle | 193 ++++++++++ .../src/main/groovy/CRLFConvertCopy.groovy | 52 +++ changes.sh | 18 + config/checkstyle/checkstyle.xml | 183 ++++++++++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43453 bytes gradle/wrapper/gradle-wrapper.properties | 7 + gradlew | 249 +++++++++++++ gradlew.bat | 92 +++++ settings.gradle | 1 + .../AbstractDeviceSpecificColorSpace.java | 43 +++ .../java2d/color/CIELabColorSpace.java | 334 ++++++++++++++++++ .../graphics/java2d/color/ColorConverter.java | 36 ++ .../java2d/color/ColorSpaceOrigin.java | 44 +++ .../sf/graphics/java2d/color/ColorSpaces.java | 111 ++++++ .../sf/graphics/java2d/color/ColorUtil.java | 166 +++++++++ .../java2d/color/ColorWithAlternatives.java | 234 ++++++++++++ .../java2d/color/DefaultColorConverter.java | 52 +++ .../java2d/color/DeviceCMYKColorSpace.java | 118 +++++++ .../java2d/color/GrayScaleColorConverter.java | 60 ++++ .../java2d/color/ICCColorSpaceWithIntent.java | 145 ++++++++ .../java2d/color/NamedColorSpace.java | 226 ++++++++++++ .../java2d/color/RenderingIntent.java | 82 +++++ .../graphics/java2d/color/package-info.java | 26 ++ .../color/profile/ColorProfileUtil.java | 162 +++++++++ .../color/profile/NamedColorProfile.java | 116 ++++++ .../profile/NamedColorProfileParser.java | 199 +++++++++++ .../java2d/color/profile/package-info.java | 26 ++ src/main/java/module-info.java | 29 ++ .../java2d/ColorConverterTestCase.java | 57 +++ .../java2d/ColorWithAlternativesTestCase.java | 80 +++++ .../graphics/java2d/NamedColorTestCase.java | 100 ++++++ .../profile/ColorProfileUtilTestCase.java | 45 +++ .../NamedColorProfileParserTestCase.java | 71 ++++ .../java2d/color/profile/ncp-example.icc | Bin 0 -> 532 bytes 43 files changed, 3836 insertions(+) create mode 100644 .editorconfig create mode 100644 .gitattributes create mode 100644 .github/workflows/build.yml create mode 100644 .github/workflows/gradle-publish.yml create mode 100644 .gitignore create mode 100644 DeveloperCertificateOfOrigin.txt create mode 100644 LICENSE create mode 100644 NOTICE create mode 100644 README.md create mode 100644 build.gradle create mode 100644 buildSrc/src/main/groovy/CRLFConvertCopy.groovy create mode 100755 changes.sh create mode 100644 config/checkstyle/checkstyle.xml create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100755 gradlew create mode 100644 gradlew.bat create mode 100644 settings.gradle create mode 100644 src/main/java/io/sf/graphics/java2d/color/AbstractDeviceSpecificColorSpace.java create mode 100644 src/main/java/io/sf/graphics/java2d/color/CIELabColorSpace.java create mode 100644 src/main/java/io/sf/graphics/java2d/color/ColorConverter.java create mode 100644 src/main/java/io/sf/graphics/java2d/color/ColorSpaceOrigin.java create mode 100644 src/main/java/io/sf/graphics/java2d/color/ColorSpaces.java create mode 100644 src/main/java/io/sf/graphics/java2d/color/ColorUtil.java create mode 100644 src/main/java/io/sf/graphics/java2d/color/ColorWithAlternatives.java create mode 100644 src/main/java/io/sf/graphics/java2d/color/DefaultColorConverter.java create mode 100644 src/main/java/io/sf/graphics/java2d/color/DeviceCMYKColorSpace.java create mode 100644 src/main/java/io/sf/graphics/java2d/color/GrayScaleColorConverter.java create mode 100644 src/main/java/io/sf/graphics/java2d/color/ICCColorSpaceWithIntent.java create mode 100644 src/main/java/io/sf/graphics/java2d/color/NamedColorSpace.java create mode 100644 src/main/java/io/sf/graphics/java2d/color/RenderingIntent.java create mode 100644 src/main/java/io/sf/graphics/java2d/color/package-info.java create mode 100644 src/main/java/io/sf/graphics/java2d/color/profile/ColorProfileUtil.java create mode 100644 src/main/java/io/sf/graphics/java2d/color/profile/NamedColorProfile.java create mode 100644 src/main/java/io/sf/graphics/java2d/color/profile/NamedColorProfileParser.java create mode 100644 src/main/java/io/sf/graphics/java2d/color/profile/package-info.java create mode 100644 src/main/java/module-info.java create mode 100644 src/test/java/io/sf/graphics/java2d/ColorConverterTestCase.java create mode 100644 src/test/java/io/sf/graphics/java2d/ColorWithAlternativesTestCase.java create mode 100644 src/test/java/io/sf/graphics/java2d/NamedColorTestCase.java create mode 100644 src/test/java/io/sf/graphics/java2d/color/profile/ColorProfileUtilTestCase.java create mode 100644 src/test/java/io/sf/graphics/java2d/color/profile/NamedColorProfileParserTestCase.java create mode 100644 src/test/resources/io/sf/graphics/java2d/color/profile/ncp-example.icc diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..a48d2ad --- /dev/null +++ b/.editorconfig @@ -0,0 +1,19 @@ +# +# https://editorconfig.org/ +# +root = true + +[*] +end_of_line = lf +charset = utf-8 + +[*.{java,gradle,groovy}] +indent_style = tab + +[*.{svg,html,xhtml,xml,xsl,css}] +indent_style = space +indent_size = 4 + +[*.bat] +end_of_line = crlf +charset = latin1 diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..5fb8a28 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,14 @@ +* text=auto eol=lf +*.java text eol=lf +*.properties text eol=lf +*.css text eol=lf +*.svg text eol=lf +*.html text eol=lf +*.xhtml text eol=lf +*.xml text eol=lf +*.dtd text eol=lf +*.txt text +*.sh text eol=lf +*.bat text eol=crlf +*.png binary +*.jar binary diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..33929d8 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,61 @@ +# Build workflow + +name: CI + +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + + # Allows to run this workflow manually from the Actions tab + workflow_dispatch: + +jobs: + + # Validate wrapper to prevent potential supply chain attack + gradle-wrapper-validation: + + runs-on: ubuntu-latest + + name: Validate Gradle wrapper + + steps: + - uses: actions/checkout@v4 + - uses: gradle/actions/wrapper-validation@v3 + + build: + + runs-on: ubuntu-latest + + strategy: + matrix: + java: [ '11', '21' ] + + name: Java ${{ matrix.java }} build + + steps: + - uses: actions/checkout@v4 + + # Set JDK + - name: Set up JDK + uses: actions/setup-java@v4 + with: + java-version: ${{ matrix.java }} + distribution: 'temurin' + + # Build + - name: Build with Gradle + run: >- + ./gradlew build + + # Upload test artifact + - name: Upload test output + uses: actions/upload-artifact@v4 + if: ${{ failure() }} + with: + name: test-output-${{ matrix.java }} + path: | + build/reports/tests/test/ + retention-days: 30 + overwrite: true diff --git a/.github/workflows/gradle-publish.yml b/.github/workflows/gradle-publish.yml new file mode 100644 index 0000000..839b24a --- /dev/null +++ b/.github/workflows/gradle-publish.yml @@ -0,0 +1,34 @@ +# This workflow will build a package using Gradle and then deploy it to GitHub +# packages when a release is published + +name: Gradle Package + +on: + release: + types: [published] + +jobs: + build: + + runs-on: ubuntu-latest + permissions: + contents: read + packages: write + + steps: + - uses: actions/checkout@v4 + - name: Set up JDK 17 + uses: actions/setup-java@v4 + with: + java-version: '17' + distribution: 'temurin' + server-id: github + settings-path: ${{ github.workspace }} + + - name: Build with Gradle + run: ./gradlew build -x test + + - name: Publish to GitHub Packages + run: >- + ./gradlew publish -PmavenReleaseRepoUrl="https://maven.pkg.github.com/css4j/echosvg" + -PmavenRepoUsername=${{ github.actor }} -PmavenRepoPassword=${{ secrets.GITHUB_TOKEN }} diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..7b30ee8 --- /dev/null +++ b/.gitignore @@ -0,0 +1,11 @@ +*~ +.classpath +.project +.settings +/bin/ +**/build/ +/.idea +/.vscode/ +/.gradle +/buildSrc/.gradle +/CHANGES.txt diff --git a/DeveloperCertificateOfOrigin.txt b/DeveloperCertificateOfOrigin.txt new file mode 100644 index 0000000..912d22e --- /dev/null +++ b/DeveloperCertificateOfOrigin.txt @@ -0,0 +1,38 @@ +Developer Certificate of Origin +Version 1.1 + +Copyright (C) 2004, 2006 The Linux Foundation and its contributors. +1 Letterman Drive +Suite D4700 +San Francisco, CA, 94129 + +Everyone is permitted to copy and distribute verbatim copies of this +license document, but changing it is not allowed. + + +Developer's Certificate of Origin 1.1 + +By making a contribution to this project, I certify that: + +(a) The contribution was created in whole or in part by me and I + have the right to submit it under the open source license + indicated in the file; or + +(b) The contribution is based upon previous work that, to the best + of my knowledge, is covered under an appropriate open source + license and I have the right under that license to submit that + work with modifications, whether created in whole or in part + by me, under the same open source license (unless I am + permitted to submit under a different license), as indicated + in the file; or + +(c) The contribution was provided directly to me by some other + person who certified (a), (b) or (c) and I have not modified + it. + +(d) I understand and agree that this project and the contribution + are public and that a record of the contribution (including all + personal information I submit with it, including my sign-off) is + maintained indefinitely and may be redistributed consistent with + this project or the open source license(s) involved. + diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..261eeb9 --- /dev/null +++ b/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/NOTICE b/NOTICE new file mode 100644 index 0000000..5ac4f4b --- /dev/null +++ b/NOTICE @@ -0,0 +1,7 @@ +Graphics-Colors + +Copyright 2024 Contributors to the graphics-colors project +Copyright 2006-2023 The Apache Software Foundation + +This product includes software developed at The Apache Software Foundation +(https://www.apache.org/) under the 'Apache XMLGraphics Commons' project. diff --git a/README.md b/README.md new file mode 100644 index 0000000..d62647c --- /dev/null +++ b/README.md @@ -0,0 +1,94 @@ +# Legacy color graphics + +[Apache XMLGraphics-Commons](https://xmlgraphics.apache.org/commons/) +contains code for the (now deprecated) SVG 1.1 extended colors, and for that +reason [EchoSVG](https://github.com/css4j/echosvg) used to depend on +xmlgraphics-commons. + +But that xmlgraphics-commons dependency implies that lots of unused code gets +into the EchoSVG classpath, so this project was created. + +
+ +## Building from source + +### Requirements + +To build Legacy-colors you need the following software installed: + +- The [Git version control system](https://git-scm.com/downloads) is required to +obtain the sources. Any recent version should suffice. + +- Java version 11 to 21 (later versions may work but aren't tested by CI). You can install +it from your favourite package manager or by downloading from [Adoptium](https://adoptium.net/). + +
+ +### Building with Gradle + +Execute the build script with `gradlew build` to build. For example: + +```shell +git clone https://github.com/css4j/legacy-colors.git +cd legacy-colors +./gradlew build +``` + +
+ +### Deploying to a Maven repository + +Use: + +- `./gradlew publishToMavenLocal` to install in your local Maven repository. + +- `./gradlew publish` to deploy to a (generally remote) Maven repository. + +If you plan to deploy to a repository, please configure the `mavenReleaseRepoUrl` +and/or `mavenSnapshotRepoUrl` properties (for example in +`GRADLE_USER_HOME/gradle.properties` or in the [command line](https://docs.gradle.org/current/userguide/build_environment.html#sec:project_properties)). +Otherwise, Gradle shall create a `build/repository` subdirectory and deploy there. + +Properties `mavenRepoUsername` and `mavenRepoPassword` can also be set (generally +from the command line). + +If you would rather look directly at the Gradle publish configurations, please +read the `publishing.repositories.maven` block of +[build.gradle](https://github.com/css4j/legacy-colors/blob/master/build.gradle). + +
+ +## Usage from a Gradle project + +If your Gradle project depends on legacy-colors, you can use this project's own Maven +repository in a `repositories` section of your build file: +```groovy +repositories { + maven { + url "https://css4j.github.io/maven/" + mavenContent { + releasesOnly() + } + content { + includeGroup 'io.sf.graphics' + includeGroup 'io.sf.carte' + includeGroup 'io.sf.jclf' + } + } +} +``` +please use that repository **only** for the artifact groups that it supplies +(basically those listed in the above `includeGroup` statements). + +Then, in your `build.gradle` file: +```groovy +dependencies { + implementation 'io.sf.graphics:legacy-colors:1.0' +} +``` + +
+ +## Licensing + + For licensing information, please read the LICENSE and NOTICE files. diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..29e5de3 --- /dev/null +++ b/build.gradle @@ -0,0 +1,193 @@ +plugins { + id 'java-library' + id 'maven-publish' + id 'checkstyle' +} + +group = 'io.sf.graphics' +version = '1.0' + +description = 'io.sf.graphics:legacy-colors' + +repositories { + maven { + url = uri('https://repo.maven.apache.org/maven2/') + } + maven { + url "https://css4j.github.io/maven/" + mavenContent { + releasesOnly() + } + content { + includeGroup "io.sf.graphics" + } + } +} + +dependencies { + testImplementation 'commons-io:commons-io:2.16.1' + testImplementation 'org.junit.jupiter:junit-jupiter:5.10.3' + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' +} + +checkstyle { + toolVersion = '10.17.0' +} + +test { + useJUnitPlatform() +} + +java { + withSourcesJar() + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 +} + +tasks.register('jvmVersionAttribute') { + description = "Set the correct 'org.gradle.jvm.version' attribute" + def jvmVersionAttribute = Attribute.of('org.gradle.jvm.version', Integer) + configurations.each { + if (it.canBeConsumed) { + def categoryAttr = it.attributes.getAttribute(Category.CATEGORY_ATTRIBUTE) + if (categoryAttr != null && categoryAttr.name == Category.LIBRARY) { + def usageAttr = it.attributes.getAttribute(Usage.USAGE_ATTRIBUTE) + if (usageAttr != null && (usageAttr.name == Usage.JAVA_API + || usageAttr.name == Usage.JAVA_RUNTIME)) { + it.attributes.attribute(jvmVersionAttribute, 8) + } + } + } + } +} + +tasks.register('compileLegacyJava', JavaCompile) { + description = 'Compile to Java 8 bytecode, except module-info' + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + source = sourceSets.main.java + dependsOn configurations.compileClasspath + classpath = sourceSets.main.compileClasspath + destinationDirectory = sourceSets.main.java.destinationDirectory + modularity.inferModulePath = false + excludes = ['module-info.java'] +} + +compileJava { + includes = ['module-info.java'] + dependsOn compileLegacyJava + classpath = sourceSets.main.compileClasspath +} + +// Check bytecode version, in case some other task screws it +tasks.register('checkLegacyJava') { + description = 'Check that classes are Java 8 bytecode (except module-info)' + enabled = enabled && !project.getPluginManager().hasPlugin('eclipse') + def classdir = sourceSets.main.output.classesDirs.files.stream().findAny().get() + def classfiles = fileTree(classdir).matching({it.exclude('module-info.class')}).files + doFirst() { + classfiles.each { + classfile -> + def classbytes = classfile.bytes + def bcversion = classbytes[6] * 128 + classbytes[7] + if (bcversion != 52) { + throw new GradleException("Bytecode on " + classfile.name + + " is not valid Java 8. Version should be 52, instead is " + bcversion) + } + } + } +} + +classes.dependsOn jvmVersionAttribute +classes.finalizedBy checkLegacyJava +jar.dependsOn checkLegacyJava + +tasks.withType(JavaCompile) { + options.encoding = 'UTF-8' +} + +tasks.withType(Javadoc) { + options.addStringOption('Xdoclint:none', '-quiet') + options.addStringOption('encoding', 'UTF-8') + options.addStringOption('charset', 'UTF-8') + options.links 'https://docs.oracle.com/en/java/javase/11/docs/api/' +} + +tasks.register('lineEndingConvCopy', CRLFConvertCopy) { + description 'Convert LICENSE and NOTICE to Windows line endings' + from "$rootDir/LICENSE" + from "$rootDir/NOTICE" +} + +// Reproducible build +tasks.withType(AbstractArchiveTask).configureEach { + preserveFileTimestamps = false + reproducibleFileOrder = true + // Copy license file + dependsOn lineEndingConvCopy + from ("$buildDir/tmp/crlf/LICENSE") { + into 'META-INF' + } + from ("$buildDir/tmp/crlf/NOTICE") { + into 'META-INF' + } +} + +publishing { + publications { + maven(MavenPublication) { + from(components.java) + pom { + description = "Legacy color graphics (derived from xmlgraphics-commons)" + url = "https://github.com/css4j/legacy-colors" + licenses { + license { + name = "The Apache License, Version 2.0" + url = "http://www.apache.org/licenses/LICENSE-2.0.txt" + } + } + scm { + connection = "scm:git:https://github.com/css4j/legacy-colors.git" + developerConnection = "scm:git:git://git@github.com:css4j/legacy-colors.git" + url = "https://github.com/css4j/legacy-colors" + } + } + } + } + repositories { + maven { + name = 'mavenRepo' + /* + * The following section applies to the 'publish' task: + * + * If you plan to deploy to a repository, please configure the + * 'mavenReleaseRepoUrl' and/or 'mavenSnapshotRepoUrl' properties + * (for example in GRADLE_USER_HOME/gradle.properties). + * + * Otherwise, Gradle shall create a 'build/repository' subdirectory + * at ${rootDir} and deploy there. + * + * Properties 'mavenRepoUsername' and 'mavenRepoPassword' can also + * be set (generally from command line). + */ + def releasesUrl + def snapshotsUrl + if (project.hasProperty('mavenReleaseRepoUrl') && project.mavenReleaseRepoUrl) { + releasesUrl = mavenReleaseRepoUrl + } else { + releasesUrl = "${buildDir}/repository/releases" + } + if (project.hasProperty('mavenSnapshotRepoUrl') && project.mavenSnapshotRepoUrl) { + snapshotsUrl = mavenSnapshotRepoUrl + } else { + snapshotsUrl = "${buildDir}/repository/snapshots" + } + url = version.endsWith('-SNAPSHOT') ? snapshotsUrl : releasesUrl + if (project.hasProperty('mavenRepoUsername') && + project.hasProperty('mavenRepoPassword')) { + credentials.username = mavenRepoUsername + credentials.password = mavenRepoPassword + } + } + } +} diff --git a/buildSrc/src/main/groovy/CRLFConvertCopy.groovy b/buildSrc/src/main/groovy/CRLFConvertCopy.groovy new file mode 100644 index 0000000..4a00e95 --- /dev/null +++ b/buildSrc/src/main/groovy/CRLFConvertCopy.groovy @@ -0,0 +1,52 @@ +/* -*- Mode: groovy; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- + * This file is licensed under the BSD-3-Clause, the Mozilla Public License 2.0 + * and the Apache 2.0 licenses. + */ + +import org.gradle.api.DefaultTask +import org.gradle.api.tasks.TaskAction + +/** + * Converts line endings to CRLF (Windows), copy to build/tmp/crlf + *

+ * Usage: + *

+ * + * tasks.register('lineEndingConvCopy', CRLFConvertCopy) { + * from "path/to/file1.txt" + * from "path/to/fileN.txt" + * } + * + */ +class CRLFConvertCopy extends DefaultTask { + + private static final String CRLF = "\r\n" + private static final String LF = "\n" + + private files = [] + + @TaskAction + def action() { + def tmpDir = new File(project.buildDir, 'tmp'); + def destDir = new File(tmpDir, 'crlf'); + if (!destDir.exists()) { + destDir.mkdirs(); + } + files.each { path -> + def file = new File(path) + if (file.exists()) { + String content = file.text + String newContent = content.replaceAll(/\r\n/, LF) + newContent = newContent.replaceAll(/\n|\r/, CRLF) + def dest = new File(destDir, file.name); + dest.write(newContent, 'utf-8') + } else { + logger.warn('File ' + path + ' does not exist.') + } + } + } + + def from(String path) { + this.files << path + } +} diff --git a/changes.sh b/changes.sh new file mode 100755 index 0000000..ef93841 --- /dev/null +++ b/changes.sh @@ -0,0 +1,18 @@ +#!/bin/bash +# +# This script writes a draft changelog in a human-readable format. +# +# You'll probably want to edit manually the result of executing the script. +# +if [[ $# -eq 0 ]] ; then + echo "No version supplied (e.g. '1.0.2')" + exit 1 +fi +OLDTAG=`git tag -l --merged master --sort=-taggerdate|head -1` +echo "Writing changes from tag $OLDTAG" +TITLE="Legacy Colors CHANGES" +VERHDR="Version ${1}" +OUTFILE="CHANGES.txt" +echo -en "${TITLE}\\r\\n${TITLE//?/=}\\r\\n\\r\\n${VERHDR}\\r\\n${VERHDR//?/-}\\r\\n\\r\\n">${OUTFILE} +git log --reverse --pretty=format:%s ${OLDTAG}..|sed -e 's/^/- /'|sed -e 's/$/./'|fold -s|sed -r 's/^([^-])/ \1/'|sed -e 's/$/\r/'>>${OUTFILE} +echo -en "\\n">>${OUTFILE} diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml new file mode 100644 index 0000000..f9416d4 --- /dev/null +++ b/config/checkstyle/checkstyle.xml @@ -0,0 +1,183 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..e6441136f3d4ba8a0da8d277868979cfbc8ad796 GIT binary patch literal 43453 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 yu?e%!_ptzGB|8GrCfu%p?(_ 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
NnX)EH+Nua)3Y(c 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 '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..25da30d --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,92 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..aabf80c --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'legacy-colors' diff --git a/src/main/java/io/sf/graphics/java2d/color/AbstractDeviceSpecificColorSpace.java b/src/main/java/io/sf/graphics/java2d/color/AbstractDeviceSpecificColorSpace.java new file mode 100644 index 0000000..ac82337 --- /dev/null +++ b/src/main/java/io/sf/graphics/java2d/color/AbstractDeviceSpecificColorSpace.java @@ -0,0 +1,43 @@ +/* + * + * See the NOTICE file distributed with this work for additional + * information regarding copyright ownership. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ +/* $Id$ */ + +package io.sf.graphics.java2d.color; + +import java.awt.color.ColorSpace; + +/** + * Base class for device-specific (uncalibrated) color spaces. + */ +public abstract class AbstractDeviceSpecificColorSpace extends ColorSpace { + + private static final long serialVersionUID = -4888985582872101875L; + + /** + * Creates a new instance. + * + * @param type the color space type ({@link ColorSpace}.TYPE_*) + * @param numcomponents the number of color components applicable to the color + * space + */ + protected AbstractDeviceSpecificColorSpace(int type, int numcomponents) { + super(type, numcomponents); + } + +} diff --git a/src/main/java/io/sf/graphics/java2d/color/CIELabColorSpace.java b/src/main/java/io/sf/graphics/java2d/color/CIELabColorSpace.java new file mode 100644 index 0000000..75155b3 --- /dev/null +++ b/src/main/java/io/sf/graphics/java2d/color/CIELabColorSpace.java @@ -0,0 +1,334 @@ +/* + * + * See the NOTICE file distributed with this work for additional + * information regarding copyright ownership. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ +/* $Id$ */ + +package io.sf.graphics.java2d.color; + +import java.awt.Color; +import java.awt.color.ColorSpace; + +/** + * This class defines the CIE L*a*b* (CIE 1976) color space. Valid values for L* + * are between 0 and 100, for a* and b* between -127 and +127. + * + * @see http://en.wikipedia.org/wiki/Lab_color_space + */ +public class CIELabColorSpace extends ColorSpace { + + private static final long serialVersionUID = -1821569090707520704L; + + //CIE XYZ tristimulus values of the reference white point: Observer= 2 degrees, Illuminant= D65 + private static final float REF_X_D65 = 95.047f; + private static final float REF_Y_D65 = 100.000f; + private static final float REF_Z_D65 = 108.883f; + + //CIE XYZ tristimulus values of the reference white point: Illuminant= D50 + private static final float REF_X_D50 = 96.42f; + private static final float REF_Y_D50 = 100.00f; + private static final float REF_Z_D50 = 82.49f; + + private static final double D = 6.0 / 29.0; + private static final double REF_A = 1.0 / (3 * Math.pow(D, 2)); //7.787037... + private static final double REF_B = 16.0 / 116.0; + private static final double T0 = Math.pow(D, 3); //0.008856... + + private float wpX; + private float wpY; + private float wpZ; + + /** + * Default constructor using the D65 white point. + */ + public CIELabColorSpace() { + this(getD65WhitePoint()); + } + + /** + * CIE Lab space constructor which allows to give an arbitrary white point. + * + * @param whitePoint the white point in XYZ coordinates (valid values: 0.0f to + * 1.0f, although values slightly larger than 1.0f are common) + */ + public CIELabColorSpace(float[] whitePoint) { + super(ColorSpace.TYPE_Lab, 3); + checkNumComponents(whitePoint, 3); + this.wpX = whitePoint[0]; + this.wpY = whitePoint[1]; + this.wpZ = whitePoint[2]; + } + + /** + * Returns the D65 white point. + * + * @return the D65 white point. + */ + public static float[] getD65WhitePoint() { + return new float[] { REF_X_D65, REF_Y_D65, REF_Z_D65 }; + } + + /** + * Returns the D50 white point. + * + * @return the D50 white point. + */ + public static float[] getD50WhitePoint() { + return new float[] { REF_X_D50, REF_Y_D50, REF_Z_D50 }; + } + + private void checkNumComponents(float[] colorvalue) { + checkNumComponents(colorvalue, getNumComponents()); + } + + private void checkNumComponents(float[] colorvalue, int expected) { + if (colorvalue == null) { + throw new NullPointerException("color value may not be null"); + } + if (colorvalue.length != expected) { + throw new IllegalArgumentException("Expected " + expected + " components, but got " + colorvalue.length); + } + } + + /** + * Returns the configured white point. + * + * @return the white point in CIE XYZ coordinates + */ + public float[] getWhitePoint() { + return new float[] { wpX, wpY, wpZ }; + } + + private static final String CIE_LAB_ONLY_HAS_3_COMPONENTS = "CIE Lab only has 3 components!"; + + /** {@inheritDoc} */ + @Override + public float getMinValue(int component) { + switch (component) { + case 0: //L* + return 0f; + case 1: //a* + case 2: //b* + return -128f; + default: + throw new IllegalArgumentException(CIE_LAB_ONLY_HAS_3_COMPONENTS); + } + } + + /** {@inheritDoc} */ + @Override + public float getMaxValue(int component) { + switch (component) { + case 0: //L* + return 100f; + case 1: //a* + case 2: //b* + return 128f; + default: + throw new IllegalArgumentException(CIE_LAB_ONLY_HAS_3_COMPONENTS); + } + } + + /** {@inheritDoc} */ + @Override + public String getName(int component) { + switch (component) { + case 0: + return "L*"; + case 1: + return "a*"; + case 2: + return "b*"; + default: + throw new IllegalArgumentException(CIE_LAB_ONLY_HAS_3_COMPONENTS); + } + } + + //Note: the conversion functions used here were mostly borrowed from Apache Commons Sanselan + //and adjusted to the local requirements. + + /** {@inheritDoc} */ + @Override + public float[] fromCIEXYZ(float[] colorvalue) { + checkNumComponents(colorvalue, 3); + float x = colorvalue[0]; + float y = colorvalue[1]; + float z = colorvalue[2]; + + double varX = x / wpX; + double varY = y / wpY; + double varZ = z / wpZ; + + if (varX > T0) { + varX = Math.pow(varX, (1 / 3.0)); + } else { + varX = (REF_A * varX) + REF_B; + } + if (varY > T0) { + varY = Math.pow(varY, 1 / 3.0); + } else { + varY = (REF_A * varY) + REF_B; + } + if (varZ > T0) { + varZ = Math.pow(varZ, 1 / 3.0); + } else { + varZ = (REF_A * varZ) + REF_B; + } + + float l = (float) ((116 * varY) - 16); + float a = (float) (500 * (varX - varY)); + float b = (float) (200 * (varY - varZ)); + + //Normalize to range 0.0..1.0 + l = normalize(l, 0); + a = normalize(a, 1); + b = normalize(b, 2); + return new float[] { l, a, b }; + } + + /** {@inheritDoc} */ + @Override + public float[] fromRGB(float[] rgbvalue) { + ColorSpace sRGB = ColorSpace.getInstance(ColorSpace.CS_sRGB); + float[] xyz = sRGB.toCIEXYZ(rgbvalue); + return fromCIEXYZ(xyz); + } + + /** {@inheritDoc} */ + @Override + public float[] toCIEXYZ(float[] colorvalue) { + checkNumComponents(colorvalue); + //Scale to native value range + float l = denormalize(colorvalue[0], 0); + float a = denormalize(colorvalue[1], 1); + float b = denormalize(colorvalue[2], 2); + + return toCIEXYZNative(l, a, b); + } + + /** + * Transforms a color value assumed to be in this {@link ColorSpace} into the + * CS_CIEXYZ conversion color space. This method uses component values in CIE + * Lab's native color ranges rather than the normalized values between 0 and 1. + * + * @param l the L* component (values between 0 and 100) + * @param a the a* component (usually between -128 and +128) + * @param b the b* component (usually between -128 and +128) + * @return the XYZ color values + * @see #toCIEXYZ(float[]) + */ + public float[] toCIEXYZNative(float l, float a, float b) { + double varY = (l + 16) / 116.0; + double varX = a / 500 + varY; + double varZ = varY - b / 200.0; + + if (Math.pow(varY, 3) > T0) { + varY = Math.pow(varY, 3); + } else { + varY = (varY - 16 / 116.0) / REF_A; + } + if (Math.pow(varX, 3) > T0) { + varX = Math.pow(varX, 3); + } else { + varX = (varX - 16 / 116.0) / REF_A; + } + if (Math.pow(varZ, 3) > T0) { + varZ = Math.pow(varZ, 3); + } else { + varZ = (varZ - 16 / 116.0) / REF_A; + } + + float x = (float) (wpX * varX / 100); + float y = (float) (wpY * varY / 100); + float z = (float) (wpZ * varZ / 100); + + return new float[] { x, y, z }; + } + + /** {@inheritDoc} */ + @Override + public float[] toRGB(float[] colorvalue) { + ColorSpace sRGB = ColorSpace.getInstance(ColorSpace.CS_sRGB); + float[] xyz = toCIEXYZ(colorvalue); + return sRGB.fromCIEXYZ(xyz); + } + + private float getNativeValueRange(int component) { + return getMaxValue(component) - getMinValue(component); + } + + private float normalize(float value, int component) { + return (value - getMinValue(component)) / getNativeValueRange(component); + } + + private float denormalize(float value, int component) { + return value * getNativeValueRange(component) + getMinValue(component); + } + + /** + * Converts normalized (0..1) color components to CIE L*a*b*'s native value + * range. + * + * @param comps the normalized components. + * @return the denormalized components + */ + public float[] toNativeComponents(float[] comps) { + checkNumComponents(comps); + float[] nativeComps = new float[comps.length]; + for (int i = 0, c = comps.length; i < c; i++) { + nativeComps[i] = denormalize(comps[i], i); + } + return nativeComps; + } + + /** + * Creates a {@link Color} instance from color values usually used by the L*a*b* + * color space by scaling them to the 0.0..1.0 range expected by Color's + * constructor. + * + * @param colorvalue the original color values (native value range, i.e. not + * normalized to 0.0..1.0) + * @param alpha the alpha component + * @return the requested color instance + */ + public Color toColor(float[] colorvalue, float alpha) { + int c = colorvalue.length; + float[] normalized = new float[c]; + for (int i = 0; i < c; i++) { + normalized[i] = normalize(colorvalue[i], i); + } + //Using ColorWithAlternatives for better equals() functionality + return new ColorWithAlternatives(this, normalized, alpha, null); + } + + /** + * Creates a {@link Color} instance from color values usually used by the L*a*b* + * color space by scaling them to the 0.0..1.0 range expected by Color's + * constructor. + * + * @param l the L* component (values between 0 and 100) + * @param a the a* component (usually between -128 and +127) + * @param b the b* component (usually between -128 and +127) + * @param alpha the alpha component (values between 0 and 1) + * @return the requested color instance + */ + public Color toColor(float l, float a, float b, float alpha) { + return toColor(new float[] { l, a, b }, alpha); + } + +} diff --git a/src/main/java/io/sf/graphics/java2d/color/ColorConverter.java b/src/main/java/io/sf/graphics/java2d/color/ColorConverter.java new file mode 100644 index 0000000..fdbb5ca --- /dev/null +++ b/src/main/java/io/sf/graphics/java2d/color/ColorConverter.java @@ -0,0 +1,36 @@ +/* + * + * See the NOTICE file distributed with this work for additional + * information regarding copyright ownership. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ +/* $Id$ */ + +package io.sf.graphics.java2d.color; + +import java.awt.Color; + +/** + * Utility for implementing a color conversion scheme. + */ +public interface ColorConverter { + + /** + * @param color to convert + * @return converted color + */ + Color convert(Color color); + +} diff --git a/src/main/java/io/sf/graphics/java2d/color/ColorSpaceOrigin.java b/src/main/java/io/sf/graphics/java2d/color/ColorSpaceOrigin.java new file mode 100644 index 0000000..2be4e96 --- /dev/null +++ b/src/main/java/io/sf/graphics/java2d/color/ColorSpaceOrigin.java @@ -0,0 +1,44 @@ +/* + * + * See the NOTICE file distributed with this work for additional + * information regarding copyright ownership. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ +/* $Id$ */ + +package io.sf.graphics.java2d.color; + +/** + * Interface used to decorate java.awt.color.ColorSpaces subclasses to report + * the origin of the associated color profile. + */ +public interface ColorSpaceOrigin { + + /** + * Returns the name of the profile used to identify the color space in a + * particular context. + * + * @return the profile name + */ + String getProfileName(); + + /** + * Returns the URI identifying the associate color profile. + * + * @return the profile URI + */ + String getProfileURI(); + +} diff --git a/src/main/java/io/sf/graphics/java2d/color/ColorSpaces.java b/src/main/java/io/sf/graphics/java2d/color/ColorSpaces.java new file mode 100644 index 0000000..3d2c6d1 --- /dev/null +++ b/src/main/java/io/sf/graphics/java2d/color/ColorSpaces.java @@ -0,0 +1,111 @@ +/* + * + * See the NOTICE file distributed with this work for additional + * information regarding copyright ownership. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ +/* $Id$ */ + +package io.sf.graphics.java2d.color; + +import java.awt.color.ColorSpace; + +/** + * Provides access to various color spaces. + */ +public final class ColorSpaces { + + private static DeviceCMYKColorSpace deviceCMYK; + private static CIELabColorSpace cieLabD50; + private static CIELabColorSpace cieLabD65; + + private ColorSpaces() { + //Don't instantiate this class + } + + /** + * Returns an instance of the device-specific CMYK color space. + * + * @return an instance of the device-specific CMYK color space + */ + public static synchronized DeviceCMYKColorSpace getDeviceCMYKColorSpace() { + if (deviceCMYK == null) { + deviceCMYK = new DeviceCMYKColorSpace(); + } + return deviceCMYK; + } + + /** + * Indicates whether the given color space is device-specific (i.e. + * uncalibrated). + * + * @param cs the color space to check + * @return true if the color space is device-specific + */ + public static boolean isDeviceColorSpace(ColorSpace cs) { + return (cs instanceof AbstractDeviceSpecificColorSpace); + } + + /** + * Returns an instance of the CIE L*a*b* color space using the D50 white point. + * + * @return an instance of the requested CIE L*a*b* color space + */ + public static synchronized CIELabColorSpace getCIELabColorSpaceD50() { + if (cieLabD50 == null) { + cieLabD50 = new CIELabColorSpace(CIELabColorSpace.getD50WhitePoint()); + } + return cieLabD50; + } + + /** + * Returns an instance of the CIE L*a*b* color space using the D65 white point. + * + * @return an instance of the requested CIE L*a*b* color space + */ + public static synchronized CIELabColorSpace getCIELabColorSpaceD65() { + if (cieLabD65 == null) { + cieLabD65 = new CIELabColorSpace(CIELabColorSpace.getD65WhitePoint()); + } + return cieLabD65; + } + + private static final ColorSpaceOrigin UNKNOWN_ORIGIN = new ColorSpaceOrigin() { + + public String getProfileURI() { + return null; + } + + public String getProfileName() { + return null; + } + + }; + + /** + * Returns information about the origin of a color space. + * + * @param cs the color space + * @return the origin information + */ + public static ColorSpaceOrigin getColorSpaceOrigin(ColorSpace cs) { + if (cs instanceof ColorSpaceOrigin) { + return (ColorSpaceOrigin) cs; + } else { + return UNKNOWN_ORIGIN; + } + } + +} diff --git a/src/main/java/io/sf/graphics/java2d/color/ColorUtil.java b/src/main/java/io/sf/graphics/java2d/color/ColorUtil.java new file mode 100644 index 0000000..6f90ce5 --- /dev/null +++ b/src/main/java/io/sf/graphics/java2d/color/ColorUtil.java @@ -0,0 +1,166 @@ +/* + * + * See the NOTICE file distributed with this work for additional + * information regarding copyright ownership. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ +/* $Id$ */ + +package io.sf.graphics.java2d.color; + +import java.awt.Color; + +/** + * Generic Color helper class. + *

+ * This class supports parsing string values into color values and creating + * color values for strings. It provides a list of standard color names. + */ +public final class ColorUtil { + + /** + * Private constructor since this is an utility class. + */ + private ColorUtil() { + } + + /** + * Lightens up a color for groove, ridge, inset and outset border effects. + * + * @param col the color to lighten up + * @param factor factor by which to lighten up (negative values darken the + * color) + * @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.0f - cols[0]) * factor; + cols[1] += (1.0f - cols[1]) * factor; + cols[2] += (1.0f - 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]); + } + + /** + * Indicates whether the color is a gray value. + * + * @param col the color + * @return true if it is a gray value + */ + public static boolean isGray(Color col) { + return (col.getRed() == col.getBlue() && col.getRed() == col.getGreen()); + } + + /** + * Creates an uncalibrated CMYK color with the given gray value. + * + * @param black the gray component (0 - 1) + * @return the CMYK color + */ + public static Color toCMYKGrayColor(float black) { + //Calculated color components + float[] cmyk = new float[] { 0f, 0f, 0f, 1.0f - black }; + //Create native color + return DeviceCMYKColorSpace.createCMYKColor(cmyk); + } + + /** + * Converts an arbitrary {@link Color} to a plain sRGB color doing the + * conversion at the best possible conversion quality. + * + * @param col the original color + * @return the sRGB equivalent + */ + public static Color toSRGBColor(Color col) { + if (col.getColorSpace().isCS_sRGB()) { + return col; //Don't convert if already sRGB to avoid conversion differences + } + float[] comps = col.getColorComponents(null); + float[] srgb = col.getColorSpace().toRGB(comps); + comps = col.getComponents(null); + float alpha = comps[comps.length - 1]; + return new Color(srgb[0], srgb[1], srgb[2], alpha); + } + + /** + * Checks if two colors are the same color. This check is much more restrictive + * than {@link Color#equals(Object)} in that it doesn't only check if both + * colors result in the same sRGB value. For example, if two colors not of the + * same exact class are compared, they are treated as not the same. + *

+ * Note: At the moment, this method only supports {@link Color} and + * {@link ColorWithAlternatives} only. Other subclasses of {@link Color} are + * checked only using the {@link Color#equals(Object)} method. + * + * @param col1 the first color + * @param col2 the second color + * @return true if both colors are the same color + */ + public static boolean isSameColor(Color col1, Color col2) { + //Check fallback sRGB values first, then go into details + if (!col1.equals(col2)) { + return false; + } + + //Consider same-ness only between colors of the same class (not subclasses) + //but consider a ColorWithAlternatives without alternatives to be the same as a Color. + Class cl1 = col1.getClass(); + if (col1 instanceof ColorWithAlternatives && !((ColorWithAlternatives) col1).hasAlternativeColors()) { + cl1 = Color.class; + } + Class cl2 = col2.getClass(); + if (col2 instanceof ColorWithAlternatives && !((ColorWithAlternatives) col2).hasAlternativeColors()) { + cl2 = Color.class; + } + if (cl1 != cl2) { + return false; + } + + //Check color space + if (!col1.getColorSpace().equals(col2.getColorSpace())) { + return false; + } + + //Check native components + float[] comps1 = col1.getComponents(null); + float[] comps2 = col2.getComponents(null); + if (comps1.length != comps2.length) { + return false; + } + for (int i = 0, c = comps1.length; i < c; i++) { + if (comps1[i] != comps2[i]) { + return false; + } + } + + //Compare alternative colors, order is relevant + if (col1 instanceof ColorWithAlternatives && col2 instanceof ColorWithAlternatives) { + ColorWithAlternatives ca1 = (ColorWithAlternatives) col1; + ColorWithAlternatives ca2 = (ColorWithAlternatives) col2; + return ca1.hasSameAlternativeColors(ca2); + } + + return true; + } + +} diff --git a/src/main/java/io/sf/graphics/java2d/color/ColorWithAlternatives.java b/src/main/java/io/sf/graphics/java2d/color/ColorWithAlternatives.java new file mode 100644 index 0000000..53bd43c --- /dev/null +++ b/src/main/java/io/sf/graphics/java2d/color/ColorWithAlternatives.java @@ -0,0 +1,234 @@ +/* + * + * See the NOTICE file distributed with this work for additional + * information regarding copyright ownership. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ +/* $Id$ */ + +package io.sf.graphics.java2d.color; + +import java.awt.Color; +import java.awt.color.ColorSpace; +import java.util.Arrays; + +/** + * Extended {@link Color} class allowing to specify a prioritized list of + * alternative colors. The alternative colors shall be the ones that are + * preferred if an output format supports them. This is normally used for + * passing device-specific colors through to the output format. + *

+ * This class only adds a single reference to a color array which should not + * increase memory consumption by much if no alternative colors are specified. + *

+ * Important: Due to a flaw in {@link Color#equals(Object)}, the + * equals() method should not be used to compare two colors, + * especially when used to update the current color for some output format. + * {@link Color} only takes the sRGB values into account but not more the + * advanced facets of this class. Use + * {@link ColorUtil#isSameColor(Color, Color)} for such a check. + */ +public class ColorWithAlternatives extends Color { + + private static final long serialVersionUID = -6125884937776779150L; + + private Color[] alternativeColors; + + /** + * Constructor for RGBA colors. + * + * @param r the red component + * @param g the green component + * @param b the blue component + * @param a the alpha component + * @param alternativeColors the prioritized list of alternative colors. + * @see Color#Color(float, float, float, float) + */ + public ColorWithAlternatives(float r, float g, float b, float a, Color[] alternativeColors) { + super(r, g, b, a); + initAlternativeColors(alternativeColors); + } + + /** + * Constructor for RGB colors. + * + * @param r the red component + * @param g the green component + * @param b the blue component + * @param alternativeColors the prioritized list of alternative colors. + * @see Color#Color(float, float, float) + */ + public ColorWithAlternatives(float r, float g, float b, Color[] alternativeColors) { + super(r, g, b); + initAlternativeColors(alternativeColors); + } + + /** + * Constructor for RGBA colors. + * + * @param rgba the combined RGBA value + * @param hasalpha true if the alpha bits are valid, false otherwise + * @param alternativeColors the prioritized list of alternative colors. + * @see Color#Color(int, boolean) + */ + public ColorWithAlternatives(int rgba, boolean hasalpha, Color[] alternativeColors) { + super(rgba, hasalpha); + initAlternativeColors(alternativeColors); + } + + /** + * Constructor for RGBA colors. + * + * @param r the red component + * @param g the green component + * @param b the blue component + * @param a the alpha component + * @param alternativeColors the prioritized list of alternative colors. + * @see Color#Color(int, int, int, int) + */ + public ColorWithAlternatives(int r, int g, int b, int a, Color[] alternativeColors) { + super(r, g, b, a); + initAlternativeColors(alternativeColors); + } + + /** + * Constructor for RGB colors. + * + * @param r the red component + * @param g the green component + * @param b the blue component + * @param alternativeColors the prioritized list of alternative colors. + * @see Color#Color(int, int, int) + */ + public ColorWithAlternatives(int r, int g, int b, Color[] alternativeColors) { + super(r, g, b); + initAlternativeColors(alternativeColors); + } + + /** + * Constructor for RGB colors. + * + * @param rgb the combined RGB components + * @param alternativeColors the prioritized list of alternative colors. + * @see Color#Color(int) + */ + public ColorWithAlternatives(int rgb, Color[] alternativeColors) { + super(rgb); + initAlternativeColors(alternativeColors); + } + + /** + * Constructor for colors with an arbitrary color space. + * + * @param cspace the color space + * @param components the color components + * @param alpha the alpha component + * @param alternativeColors the prioritized list of alternative colors. + * @see Color#Color(ColorSpace, float[], float) + */ + public ColorWithAlternatives(ColorSpace cspace, float[] components, float alpha, Color[] alternativeColors) { + super(cspace, components, alpha); + initAlternativeColors(alternativeColors); + } + + private void initAlternativeColors(Color[] colors) { + if (colors != null) { + //Colors are immutable but array are not, so copy + this.alternativeColors = new Color[colors.length]; + System.arraycopy(colors, 0, this.alternativeColors, 0, colors.length); + } + } + + /** + * Returns the list of alternative colors. An empty array will be returned if no + * alternative colors are available. + * + * @return the list of alternative colors + */ + public Color[] getAlternativeColors() { + if (this.alternativeColors != null) { + Color[] cols = new Color[this.alternativeColors.length]; + System.arraycopy(this.alternativeColors, 0, cols, 0, this.alternativeColors.length); + return cols; + } else { + return new Color[0]; + } + } + + /** + * Indicates whether alternative colors are available. + * + * @return true if alternative colors are available. + */ + public boolean hasAlternativeColors() { + return this.alternativeColors != null && this.alternativeColors.length > 0; + } + + /** + * Indicates whether another instance has the same alternative colors. + * + * @param col the color to compare the alternatives to + * @return true if the same alternative colors are present + */ + public boolean hasSameAlternativeColors(ColorWithAlternatives col) { + if (!hasAlternativeColors()) { + return !col.hasAlternativeColors(); + } + // this.hasAlternativeColors() + if (!col.hasAlternativeColors()) { + return false; + } + // this.hasAlternativeColors() && col.hasAlternativeColors() + Color[] alt1 = getAlternativeColors(); + Color[] alt2 = col.getAlternativeColors(); + if (alt1.length != alt2.length) { + return false; + } + for (int i = 0, c = alt1.length; i < c; i++) { + Color c1 = alt1[i]; + Color c2 = alt2[i]; + if (!ColorUtil.isSameColor(c1, c2)) { + return false; + } + } + return true; + } + + /** + * Returns the first alternative color found with the given color space type. + * + * @param colorSpaceType the color space type ({@link ColorSpace}.TYPE_*). + * @return the requested alternative color or null, if no match was found + */ + public Color getFirstAlternativeOfType(int colorSpaceType) { + if (hasAlternativeColors()) { + for (Color alternativeColor : this.alternativeColors) { + if (alternativeColor.getColorSpace().getType() == colorSpaceType) { + return alternativeColor; + } + } + } + return null; + } + + public int hashCode() { + int hash = super.hashCode(); + if (alternativeColors != null) { + hash = 37 * hash + Arrays.hashCode(alternativeColors); + } + return hash; + } + +} diff --git a/src/main/java/io/sf/graphics/java2d/color/DefaultColorConverter.java b/src/main/java/io/sf/graphics/java2d/color/DefaultColorConverter.java new file mode 100644 index 0000000..f379d86 --- /dev/null +++ b/src/main/java/io/sf/graphics/java2d/color/DefaultColorConverter.java @@ -0,0 +1,52 @@ +/* + * + * See the NOTICE file distributed with this work for additional + * information regarding copyright ownership. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ +/* $Id$ */ + +package io.sf.graphics.java2d.color; + +import java.awt.Color; + +/** + * A default implementation that does not apply any conversion + */ +public final class DefaultColorConverter implements ColorConverter { + + /** + * private constructor to support singleton pattern + */ + private static final DefaultColorConverter SINGLETON = new DefaultColorConverter(); + + private DefaultColorConverter() { + } + + /** + * static factory + * + * @return singleton instance of DefaultColorConverter + */ + public static DefaultColorConverter getInstance() { + return SINGLETON; + } + + /** {@inheritDoc} */ + public Color convert(Color color) { + return color; + } + +} diff --git a/src/main/java/io/sf/graphics/java2d/color/DeviceCMYKColorSpace.java b/src/main/java/io/sf/graphics/java2d/color/DeviceCMYKColorSpace.java new file mode 100644 index 0000000..82468d9 --- /dev/null +++ b/src/main/java/io/sf/graphics/java2d/color/DeviceCMYKColorSpace.java @@ -0,0 +1,118 @@ +/* + * + * See the NOTICE file distributed with this work for additional + * information regarding copyright ownership. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ +/* $Id$ */ + +package io.sf.graphics.java2d.color; + +import java.awt.Color; + +/** + * This class represents an uncalibrated CMYK color space. + */ +public class DeviceCMYKColorSpace extends AbstractDeviceSpecificColorSpace implements ColorSpaceOrigin { + + private static final long serialVersionUID = 2925508946083542974L; + + /** The name for the uncalibrated CMYK pseudo-profile */ + public static final String PSEUDO_PROFILE_NAME = "#CMYK"; + + /** + * Constructs an uncalibrated CMYK ColorSpace object with + * {@link java.awt.color.ColorSpace#TYPE_CMYK} and 4 components. + * + * @see java.awt.color.ColorSpace#ColorSpace(int, int) + */ + public DeviceCMYKColorSpace() { + super(TYPE_CMYK, 4); + } + + /** + * Returns an instance of an uncalibrated CMYK color space. + * + * @return CMYKColorSpace the requested color space object + * @deprecated Use {@link ColorSpaces#getDeviceCMYKColorSpace()} instead. + */ + @Deprecated + public static DeviceCMYKColorSpace getInstance() { + return ColorSpaces.getDeviceCMYKColorSpace(); + } + + /** {@inheritDoc} */ + @Override + public float[] toRGB(float[] colorvalue) { + return new float[] { (1 - colorvalue[0]) * (1 - colorvalue[3]), (1 - colorvalue[1]) * (1 - colorvalue[3]), + (1 - colorvalue[2]) * (1 - colorvalue[3]) }; + } + + /** {@inheritDoc} */ + @Override + public float[] fromRGB(float[] rgbvalue) { + assert rgbvalue.length == 3; + //Note: this is an arbitrary conversion, not a color-managed one! + float r = rgbvalue[0]; + float g = rgbvalue[1]; + float b = rgbvalue[2]; + if (r == g && r == b) { + return new float[] { 0, 0, 0, 1 - r }; + } else { + float c = 1 - r; + float m = 1 - g; + float y = 1 - b; + float k = Math.min(c, Math.min(m, y)); + return new float[] { c, m, y, k }; + } + } + + /** {@inheritDoc} */ + @Override + public float[] toCIEXYZ(float[] colorvalue) { + throw new UnsupportedOperationException("NYI"); + } + + /** {@inheritDoc} */ + @Override + public float[] fromCIEXYZ(float[] colorvalue) { + throw new UnsupportedOperationException("NYI"); + } + + /** + * Creates a color instance representing a device-specific CMYK color. An sRGB + * value is calculated from the CMYK colors but it may not correctly represent + * the given CMYK values. + * + * @param cmykComponents the CMYK components + * @return the device-specific color + */ + public static Color createCMYKColor(float[] cmykComponents) { + DeviceCMYKColorSpace cmykCs = ColorSpaces.getDeviceCMYKColorSpace(); + Color cmykColor = new ColorWithAlternatives(cmykCs, cmykComponents, 1.0f, null); + return cmykColor; + } + + /** {@inheritDoc} */ + public String getProfileName() { + return PSEUDO_PROFILE_NAME; + } + + /** {@inheritDoc} */ + public String getProfileURI() { + return null; //No URI + } + +} diff --git a/src/main/java/io/sf/graphics/java2d/color/GrayScaleColorConverter.java b/src/main/java/io/sf/graphics/java2d/color/GrayScaleColorConverter.java new file mode 100644 index 0000000..10cc246 --- /dev/null +++ b/src/main/java/io/sf/graphics/java2d/color/GrayScaleColorConverter.java @@ -0,0 +1,60 @@ +/* + * + * See the NOTICE file distributed with this work for additional + * information regarding copyright ownership. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ +/* $Id$ */ + +package io.sf.graphics.java2d.color; + +import java.awt.Color; + +/** + * Converts to grayscale using the standard RED=30%, GREEN=59% and BLUE=11% + * weights (see http://en.wikipedia.org/wiki/Grayscale) + */ +public final class GrayScaleColorConverter implements ColorConverter { + + private static final int RED_WEIGHT = 77; + private static final int GREEN_WEIGTH = 150; + private static final int BLUE_WEIGHT = 28; + + private static final GrayScaleColorConverter SINGLETON = new GrayScaleColorConverter(); + + private GrayScaleColorConverter() { + } + + /** + * Returns a singleton instance. + * + * @return singleton instance of GrayScaleColorConverter + */ + public static GrayScaleColorConverter getInstance() { + return SINGLETON; + } + + /** + * The color is converted to CMYK with just the K component. {@inheritDoc} + */ + public Color convert(Color color) { + + float kValue = (RED_WEIGHT * color.getRed() + GREEN_WEIGTH * color.getGreen() + BLUE_WEIGHT * color.getBlue()) + / 255.0f / 255.0f; + + return ColorUtil.toCMYKGrayColor(kValue); + } + +} diff --git a/src/main/java/io/sf/graphics/java2d/color/ICCColorSpaceWithIntent.java b/src/main/java/io/sf/graphics/java2d/color/ICCColorSpaceWithIntent.java new file mode 100644 index 0000000..8db94df --- /dev/null +++ b/src/main/java/io/sf/graphics/java2d/color/ICCColorSpaceWithIntent.java @@ -0,0 +1,145 @@ +/* + * + * See the NOTICE file distributed with this work for additional + * information regarding copyright ownership. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ +/* $Id$ */ + +package io.sf.graphics.java2d.color; + +import java.awt.color.ColorSpace; +import java.awt.color.ICC_ColorSpace; +import java.awt.color.ICC_Profile; + +/** + * This class extends the ICCColorSpace class by providing convenience methods + * to convert to sRGB using various methods, forcing a given intent, such as + * perceptual or relative colorimetric. It also additionally holds the name and + * source URI of the color profile. + */ +public class ICCColorSpaceWithIntent extends ICC_ColorSpace implements ColorSpaceOrigin { + + private static final long serialVersionUID = -3338065900662625221L; + + static final ColorSpace SRGB = ColorSpace.getInstance(ColorSpace.CS_sRGB); + + private RenderingIntent intent; + private String profileName; + private String profileURI; + + /** + * Creates a new ICC-based color space. + * + * @param p the color profile + * @param intent the overriding rendering intent (use + * {@link RenderingIntent#AUTO} to preserve the profile's) + * @param profileName the color profile name + * @param profileURI the source URI of the color profile + */ + public ICCColorSpaceWithIntent(ICC_Profile p, RenderingIntent intent, String profileName, String profileURI) { + super(p); + + this.intent = intent; + + /** + * Apply the requested intent into the profile + */ + if (intent != RenderingIntent.AUTO) { + byte[] hdr = p.getData(ICC_Profile.icSigHead); + hdr[ICC_Profile.icHdrRenderingIntent] = (byte) intent.getIntegerValue(); + } + + this.profileName = profileName; + this.profileURI = profileURI; + } + + /** + * Returns the sRGB value obtained by forcing the conversion method to the + * intent passed to the constructor. + * + * @param values the color values in the local color space + * @return the sRGB values + */ + public float[] intendedToRGB(float[] values) { + switch (intent) { + case ABSOLUTE_COLORIMETRIC: + return absoluteColorimetricToRGB(values); + case PERCEPTUAL: + case AUTO: + return perceptualToRGB(values); + case RELATIVE_COLORIMETRIC: + return relativeColorimetricToRGB(values); + case SATURATION: + return saturationToRGB(values); + default: + throw new RuntimeException("invalid intent:" + intent); + } + } + + /** + * Perceptual conversion is the method implemented by the base class's toRGB + * method + * + * @param values the color values in the local color space + * @return the sRGB values + */ + private float[] perceptualToRGB(float[] values) { + return toRGB(values); + } + + /** + * Relative colorimetric needs to happen through CIEXYZ conversion. + * + * @param values the color values in the local color space + * @return the sRGB values + */ + private float[] relativeColorimetricToRGB(float[] values) { + float[] ciexyz = toCIEXYZ(values); + return SRGB.fromCIEXYZ(ciexyz); + } + + /** + * Absolute colorimetric. NOT IMPLEMENTED. Temporarily returns same as + * perceptual. + * + * @param values the color values in the local color space + * @return the sRGB values + */ + private float[] absoluteColorimetricToRGB(float[] values) { + return perceptualToRGB(values); + } + + /** + * Saturation. NOT IMPLEMENTED. Temporarily returns same as perceptual. + * + * @param values the color values in the local color space + * @return the sRGB values + */ + private float[] saturationToRGB(float[] values) { + return perceptualToRGB(values); + } + + /** {@inheritDoc} */ + public String getProfileName() { + return this.profileName; + } + + /** {@inheritDoc} */ + public String getProfileURI() { + return this.profileURI; + } + +} diff --git a/src/main/java/io/sf/graphics/java2d/color/NamedColorSpace.java b/src/main/java/io/sf/graphics/java2d/color/NamedColorSpace.java new file mode 100644 index 0000000..fedff6b --- /dev/null +++ b/src/main/java/io/sf/graphics/java2d/color/NamedColorSpace.java @@ -0,0 +1,226 @@ +/* + * + * See the NOTICE file distributed with this work for additional + * information regarding copyright ownership. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ +/* $Id$ */ + +package io.sf.graphics.java2d.color; + +import java.awt.Color; +import java.awt.color.ColorSpace; + +/** + * Implements a pseudo color space for a named color which is defined in the CIE + * XYZ color space. At the moment, this color space always returns the fully + * opaque color regardless of the single component value (tint) given to its + * conversion methods. + */ +public class NamedColorSpace extends ColorSpace implements ColorSpaceOrigin { + + private static final long serialVersionUID = -8957543225908514658L; + + private final String name; + private final float[] xyz; + + private final String profileName; + private final String profileURI; + + /** + * Creates a new named color. + * + * @param name the color name + * @param xyz the CIE XYZ coordinates (valid values: 0.0f to 1.0f, although + * values slightly larger than 1.0f are common) + */ + public NamedColorSpace(String name, float[] xyz) { + this(name, xyz, null, null); + } + + /** + * Creates a new named color. + * + * @param name the color name + * @param xyz the CIE XYZ coordinates (valid values: 0.0f to 1.0f, + * although values slightly larger than 1.0f are common) + * @param profileName Optional profile name associated with this color space + * @param profileURI Optional profile URI associated with this color space + */ + public NamedColorSpace(String name, float[] xyz, String profileName, String profileURI) { + super(ColorSpace.TYPE_GRAY, 1); + checkNumComponents(xyz, 3); + if (name == null || name.trim().length() == 0) { + throw new IllegalArgumentException("No name provided for named color space"); + } + this.name = name.trim(); + this.xyz = new float[3]; + System.arraycopy(xyz, 0, this.xyz, 0, 3); + this.profileName = profileName; + this.profileURI = profileURI; + } + + /** + * Creates a new named color. + * + * @param name the color name + * @param color the color to use when the named color's specific color + * properties are not available. + * @param profileName Optional profile name associated with this color space + * @param profileURI Optional profile URI associated with this color space + */ + public NamedColorSpace(String name, Color color, String profileName, String profileURI) { + this(name, color.getColorSpace().toCIEXYZ(color.getColorComponents(null)), profileName, profileURI); + } + + /** + * Creates a new named color. + * + * @param name the color name + * @param color the color to use when the named color's specific color + * properties are not available. + */ + public NamedColorSpace(String name, Color color) { + this(name, color.getColorSpace().toCIEXYZ(color.getColorComponents(null)), null, null); + } + + private void checkNumComponents(float[] colorvalue, int expected) { + if (colorvalue == null) { + throw new NullPointerException("color value may not be null"); + } + if (colorvalue.length != expected) { + throw new IllegalArgumentException("Expected " + expected + " components, but got " + colorvalue.length); + } + } + + /** + * Returns the color name. + * + * @return the color name + */ + public String getColorName() { + return this.name; + } + + /** {@inheritDoc} */ + public String getProfileName() { + return this.profileName; + } + + /** {@inheritDoc} */ + public String getProfileURI() { + return this.profileURI; + } + + /** + * Returns the XYZ coordinates of the named color. + * + * @return the XYZ coordinates of the named color + */ + public float[] getXYZ() { + float[] result = new float[this.xyz.length]; + System.arraycopy(this.xyz, 0, result, 0, this.xyz.length); + return result; + } + + /** + * Returns an sRGB-based color representing the full-tint color defined by this + * named color space. + * + * @return the sRGB color + */ + public Color getRGBColor() { + float[] comps = toRGB(this.xyz); + return new Color(comps[0], comps[1], comps[2]); + } + + /** {@inheritDoc} */ + public float getMinValue(int component) { + return getMaxValue(component); //same as min, i.e. always 1.0 + } + + /** {@inheritDoc} */ + public float getMaxValue(int component) { + switch (component) { + case 0: + return 1f; + default: + throw new IllegalArgumentException("A named color space only has 1 component!"); + } + } + + /** {@inheritDoc} */ + public String getName(int component) { + switch (component) { + case 0: + return "Tint"; + default: + throw new IllegalArgumentException("A named color space only has 1 component!"); + } + } + + /** {@inheritDoc} */ + public float[] fromCIEXYZ(float[] colorvalue) { + //ignore the given color values as this is a fixed color. + return new float[] { 1.0f }; //Return value for full tint + } + + /** {@inheritDoc} */ + public float[] fromRGB(float[] rgbvalue) { + //ignore the given color values as this is a fixed color. + return new float[] { 1.0f }; //Return value for full tint + } + + /** {@inheritDoc} */ + public float[] toCIEXYZ(float[] colorvalue) { + float[] ret = new float[3]; + System.arraycopy(this.xyz, 0, ret, 0, this.xyz.length); + return ret; + } + + /** {@inheritDoc} */ + public float[] toRGB(float[] colorvalue) { + ColorSpace sRGB = ColorSpace.getInstance(ColorSpace.CS_sRGB); + return sRGB.fromCIEXYZ(this.xyz); + } + + /** {@inheritDoc} */ + public boolean equals(Object obj) { + if (!(obj instanceof NamedColorSpace)) { + return false; + } + NamedColorSpace other = (NamedColorSpace) obj; + if (!this.name.equals(other.name)) { + return false; + } + for (int i = 0, c = this.xyz.length; i < c; i++) { + if (this.xyz[i] != other.xyz[i]) { + return false; + } + } + return true; + } + + /** {@inheritDoc} */ + public int hashCode() { + return (this.profileName + name).hashCode(); + } + + /** {@inheritDoc} */ + public String toString() { + return "Named Color Space: " + getColorName(); + } + +} diff --git a/src/main/java/io/sf/graphics/java2d/color/RenderingIntent.java b/src/main/java/io/sf/graphics/java2d/color/RenderingIntent.java new file mode 100644 index 0000000..9824ff2 --- /dev/null +++ b/src/main/java/io/sf/graphics/java2d/color/RenderingIntent.java @@ -0,0 +1,82 @@ +/* + * + * See the NOTICE file distributed with this work for additional + * information regarding copyright ownership. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ +/* $Id$ */ + +package io.sf.graphics.java2d.color; + +import java.awt.color.ICC_Profile; + +/** + * Enumeration for rendering intents. + */ +public enum RenderingIntent { + + /** Perceptual rendering intent. Typical use: scanned images. */ + PERCEPTUAL(ICC_Profile.icPerceptual), + /** Relative colorimetric rendering intent. Typical use: vector graphics. */ + RELATIVE_COLORIMETRIC(ICC_Profile.icRelativeColorimetric), + /** + * Absolute colorimetric rendering intent. Typical use: logos and solid colors. + */ + ABSOLUTE_COLORIMETRIC(ICC_Profile.icAbsoluteColorimetric), + /** Saturation rendering intent. Typical use: business graphics. */ + SATURATION(ICC_Profile.icSaturation), + /** Automatic rendering intent. The color profile's intent isn't overridden. */ + AUTO(4); + + private int intValue; + + private RenderingIntent(int value) { + this.intValue = value; + } + + /** + * Returns an integer value identifying the rendering intent. This is the same + * value defined by the ICC specification (0..3) plus one for "auto" (4). (See + * also {@link ICC_Profile}.ic*) + * + * @return the integer value + */ + public int getIntegerValue() { + return this.intValue; + } + + /** + * Returns the enum value for the given integer rendering intent (as defined by + * the ICC specification). + * + * @param value the rendering intent as ICC value + * @return the matching enum + */ + public static RenderingIntent fromICCValue(int value) { + switch (value) { + case ICC_Profile.icPerceptual: + return PERCEPTUAL; + case ICC_Profile.icRelativeColorimetric: + return RELATIVE_COLORIMETRIC; + case ICC_Profile.icAbsoluteColorimetric: + return ABSOLUTE_COLORIMETRIC; + case ICC_Profile.icSaturation: + return SATURATION; + default: + throw new IllegalArgumentException("Invalid value for rendering intent: " + value); + } + } + +} diff --git a/src/main/java/io/sf/graphics/java2d/color/package-info.java b/src/main/java/io/sf/graphics/java2d/color/package-info.java new file mode 100644 index 0000000..cf538ef --- /dev/null +++ b/src/main/java/io/sf/graphics/java2d/color/package-info.java @@ -0,0 +1,26 @@ +/* + * + * See the NOTICE file distributed with this work for additional + * information regarding copyright ownership. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ +/** + * Legacy color infrastructure for Java2D. + *

+ * Provides additional color infrastructure so SVG implementations can store + * additional color information and do things like legacy color conversions. + *

+ */ +package io.sf.graphics.java2d.color; diff --git a/src/main/java/io/sf/graphics/java2d/color/profile/ColorProfileUtil.java b/src/main/java/io/sf/graphics/java2d/color/profile/ColorProfileUtil.java new file mode 100644 index 0000000..41ea7c1 --- /dev/null +++ b/src/main/java/io/sf/graphics/java2d/color/profile/ColorProfileUtil.java @@ -0,0 +1,162 @@ +/* + * + * See the NOTICE file distributed with this work for additional + * information regarding copyright ownership. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ +/* $Id$ */ + +package io.sf.graphics.java2d.color.profile; + +import java.awt.color.ColorSpace; +import java.awt.color.ICC_Profile; +import java.awt.color.ICC_ProfileRGB; +import java.io.IOException; +import java.io.InputStream; +import java.io.UnsupportedEncodingException; +import java.util.Arrays; + +// CSOFF: MethodName + +/** + * Helper methods for handling color profiles. + */ +public final class ColorProfileUtil { + + private ColorProfileUtil() { + } + + /** + * Returns the profile description of an ICC profile + * + * @param profile the profile + * @return the description + */ + public static String getICCProfileDescription(ICC_Profile profile) { + byte[] data = profile.getData(ICC_Profile.icSigProfileDescriptionTag); + if (data == null) { + return null; + } else { + //Info on the data format: http://www.color.org/ICC-1_1998-09.PDF + int length = (data[8] << 3 * 8) | (data[9] << 2 * 8) | (data[10] << 8) | data[11]; + length--; //Remove trailing NUL character + try { + return new String(data, 12, length, "US-ASCII"); + } catch (UnsupportedEncodingException e) { + throw new UnsupportedOperationException("Incompatible VM"); + } + } + } + + /** + * Indicates whether a given color profile is identical to the default sRGB + * profile provided by the Java class library. + * + * @param profile the color profile to check + * @return true if it is the default sRGB profile + */ + public static boolean isDefaultsRGB(ICC_Profile profile) { + if (!(profile instanceof ICC_ProfileRGB)) { + return false; + } + // not sure what the best way to compare two profiles is, but comparing instances is not the right way + ICC_Profile sRGBProfile = ICC_Profile.getInstance(ColorSpace.CS_sRGB); + if (profile.getProfileClass() != sRGBProfile.getProfileClass()) { + return false; + } + if (profile.getMajorVersion() != sRGBProfile.getMajorVersion()) { + return false; + } + if (profile.getMinorVersion() != sRGBProfile.getMinorVersion()) { + return false; + } + if (!Arrays.equals(profile.getData(), sRGBProfile.getData())) { + return false; + } + return true; + } + + /** + * Proxy method for {@link ICC_Profile#getInstance(byte[])} that properly + * synchronizes the call to avoid a potential race condition. + * + * @param data the specified ICC Profile data + * @return an {@link ICC_Profile} instance corresponding to the data in the + * specified byte array + */ + public static ICC_Profile getICC_Profile(byte[] data) { + synchronized (ICC_Profile.class) { + return ICC_Profile.getInstance(data); + } + } + + /** + * Proxy method for {@link ICC_Profile#getInstance(int)} that properly + * synchronizes the call to avoid a potential race condition. + * + * @param colorSpace the type of color space to create a profile for. The + * specified type is one of the color space constants defined + * in the {@link ColorSpace} class. + * @return an {@link ICC_Profile} instance corresponding to the specified + * {@code ColorSpace} + * @throws IllegalArgumentException if {@code colorSpace} is not one of the + * predefined types + */ + public static ICC_Profile getICC_Profile(int colorSpace) { + synchronized (ICC_Profile.class) { + return ICC_Profile.getInstance(colorSpace); + } + } + + /** + * Proxy method for {@link ICC_Profile#getInstance(java.io.InputStream)} that + * properly synchronizes the call to avoid a potential race condition. + * + * @param in the input stream from which to read the profile data + * @return an {@link ICC_Profile} instance corresponding to the data in the + * specified {@link InputStream} + * @throws IOException if an I/O error occurs while reading the + * stream + * @throws IllegalArgumentException if the stream does not contain valid ICC + * Profile data + */ + public static ICC_Profile getICC_Profile(InputStream in) throws IOException { + synchronized (ICC_Profile.class) { + return ICC_Profile.getInstance(in); + } + } + + /** + * Proxy method for {@link ICC_Profile#getInstance(java.lang.String)} that + * properly synchronizes the call to avoid a potential race condition. + * + * @param fileName the name of the file that contains the profile data + * @return an {@link ICC_Profile} instance corresponding to the data in the + * specified file + * @throws IOException if the file cannot be opened, or an I/O + * error occurs while reading the stream + * @throws IllegalArgumentException if the stream does not contain valid ICC + * Profile data + * @throws SecurityException if a security manager is installed and it + * does not permit read access to the given + * file. + */ + public static ICC_Profile getICC_Profile(String fileName) throws IOException { + synchronized (ICC_Profile.class) { + return ICC_Profile.getInstance(fileName); + } + } + +} diff --git a/src/main/java/io/sf/graphics/java2d/color/profile/NamedColorProfile.java b/src/main/java/io/sf/graphics/java2d/color/profile/NamedColorProfile.java new file mode 100644 index 0000000..6f70e4b --- /dev/null +++ b/src/main/java/io/sf/graphics/java2d/color/profile/NamedColorProfile.java @@ -0,0 +1,116 @@ +/* + * + * See the NOTICE file distributed with this work for additional + * information regarding copyright ownership. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ +/* $Id$ */ + +package io.sf.graphics.java2d.color.profile; + +import io.sf.graphics.java2d.color.NamedColorSpace; +import io.sf.graphics.java2d.color.RenderingIntent; + +/** + * Simplified in-memory representation of an ICC named color profile. + */ +public class NamedColorProfile { + + private String profileName; + private String copyright; + private NamedColorSpace[] namedColors; + private RenderingIntent renderingIntent = RenderingIntent.PERCEPTUAL; + + /** + * Creates a new named color profile. + * + * @param profileName the profile name + * @param copyright the copyright + * @param namedColors the array of named colors + * @param intent the rendering intent + */ + public NamedColorProfile(String profileName, String copyright, NamedColorSpace[] namedColors, + RenderingIntent intent) { + this.profileName = profileName; + this.copyright = copyright; + this.namedColors = namedColors; + this.renderingIntent = intent; + } + + /** + * Returns the color profile's rendering intent. + * + * @return the rendering intent (See {@link java.awt.color.ICC_Profile}.ic*) + */ + public RenderingIntent getRenderingIntent() { + return this.renderingIntent; + } + + /** + * Returns the array of named colors. + * + * @return the array of named colors + */ + public NamedColorSpace[] getNamedColors() { + NamedColorSpace[] copy = new NamedColorSpace[this.namedColors.length]; + System.arraycopy(this.namedColors, 0, copy, 0, this.namedColors.length); + return copy; + } + + /** + * Returns a named color. + * + * @param name the color name + * @return the named color (or null if it is not available) + */ + public NamedColorSpace getNamedColor(String name) { + if (this.namedColors != null) { + for (NamedColorSpace namedColor : this.namedColors) { + if (namedColor.getColorName().equals(name)) { + return namedColor; + } + } + } + return null; + } + + /** + * Returns the profile name. + * + * @return the profile name + */ + public String getProfileName() { + return this.profileName; + } + + /** + * Returns the profile copyright. + * + * @return the profile copyright + */ + public String getCopyright() { + return this.copyright; + } + + /** {@inheritDoc} */ + @Override + public String toString() { + StringBuffer sb = new StringBuffer("Named color profile: "); + sb.append(getProfileName()); + sb.append(", ").append(namedColors.length).append(" colors"); + return sb.toString(); + } + +} diff --git a/src/main/java/io/sf/graphics/java2d/color/profile/NamedColorProfileParser.java b/src/main/java/io/sf/graphics/java2d/color/profile/NamedColorProfileParser.java new file mode 100644 index 0000000..2bc3396 --- /dev/null +++ b/src/main/java/io/sf/graphics/java2d/color/profile/NamedColorProfileParser.java @@ -0,0 +1,199 @@ +/* + * + * See the NOTICE file distributed with this work for additional + * information regarding copyright ownership. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ +/* $Id$ */ + +package io.sf.graphics.java2d.color.profile; + +import java.awt.color.ColorSpace; +import java.awt.color.ICC_Profile; +import java.io.ByteArrayInputStream; +import java.io.DataInput; +import java.io.DataInputStream; +import java.io.IOException; + +import io.sf.graphics.java2d.color.CIELabColorSpace; +import io.sf.graphics.java2d.color.ColorSpaces; +import io.sf.graphics.java2d.color.NamedColorSpace; +import io.sf.graphics.java2d.color.RenderingIntent; + +/** + * This class is a parser for ICC named color profiles. It uses Java's + * {@link ICC_Profile} class for parsing the basic structure but adds + * functionality to parse certain profile tags. + */ +public class NamedColorProfileParser { + + private static final int MLUC = 0x6D6C7563; //'mluc' + private static final int NCL2 = 0x6E636C32; //'ncl2' + + /** + * Indicates whether the profile is a named color profile. + * + * @param profile the color profile + * @return true if the profile is a named color profile, false otherwise + */ + public static boolean isNamedColorProfile(ICC_Profile profile) { + return profile.getProfileClass() == ICC_Profile.CLASS_NAMEDCOLOR; + } + + /** + * Parses a named color profile (NCP). + * + * @param profile the profile to analyze + * @param profileName Optional profile name associated with this color profile + * @param profileURI Optional profile URI associated with this color profile + * @return an object representing the parsed NCP + * @throws IOException if an I/O error occurs + */ + public NamedColorProfile parseProfile(ICC_Profile profile, String profileName, String profileURI) + throws IOException { + if (!isNamedColorProfile(profile)) { + throw new IllegalArgumentException("Given profile is not a named color profile (NCP)"); + } + String profileDescription = getProfileDescription(profile); + String copyright = getCopyright(profile); + RenderingIntent intent = getRenderingIntent(profile); + NamedColorSpace[] ncs = readNamedColors(profile, profileName, profileURI); + return new NamedColorProfile(profileDescription, copyright, ncs, intent); + } + + /** + * Parses a named color profile (NCP). + * + * @param profile the profile to analyze + * @return an object representing the parsed NCP + * @throws IOException if an I/O error occurs + */ + public NamedColorProfile parseProfile(ICC_Profile profile) throws IOException { + return parseProfile(profile, null, null); + } + + private String getProfileDescription(ICC_Profile profile) throws IOException { + byte[] tag = profile.getData(ICC_Profile.icSigProfileDescriptionTag); + return readSimpleString(tag); + } + + private String getCopyright(ICC_Profile profile) throws IOException { + byte[] tag = profile.getData(ICC_Profile.icSigCopyrightTag); + return readSimpleString(tag); + } + + private RenderingIntent getRenderingIntent(ICC_Profile profile) throws IOException { + byte[] hdr = profile.getData(ICC_Profile.icSigHead); + int value = hdr[ICC_Profile.icHdrRenderingIntent]; + return RenderingIntent.fromICCValue(value); + } + + private NamedColorSpace[] readNamedColors(ICC_Profile profile, String profileName, String profileURI) + throws IOException { + byte[] tag = profile.getData(ICC_Profile.icSigNamedColor2Tag); + DataInput din = new DataInputStream(new ByteArrayInputStream(tag)); + int sig = din.readInt(); + if (sig != NCL2) { + throw new UnsupportedOperationException( + "Unsupported structure type: " + toSignatureString(sig) + ". Expected " + toSignatureString(NCL2)); + } + din.skipBytes(8); + int numColors = din.readInt(); + NamedColorSpace[] result = new NamedColorSpace[numColors]; + int numDeviceCoord = din.readInt(); + String prefix = readAscii(din, 32); + String suffix = readAscii(din, 32); + for (int i = 0; i < numColors; i++) { + String name = prefix + readAscii(din, 32) + suffix; + int[] pcs = readUInt16Array(din, 3); + float[] colorvalue = new float[3]; + for (int j = 0; j < pcs.length; j++) { + colorvalue[j] = ((float) pcs[j]) / 0x8000; + } + + //device coordinates are ignored for now + /* int[] deviceCoord = */ readUInt16Array(din, numDeviceCoord); + + switch (profile.getPCSType()) { + case ColorSpace.TYPE_XYZ: + result[i] = new NamedColorSpace(name, colorvalue, profileName, profileURI); + break; + case ColorSpace.TYPE_Lab: + //Not sure if this always D50 here, + //but the illuminant in the header is fixed to D50. + CIELabColorSpace labCS = ColorSpaces.getCIELabColorSpaceD50(); + result[i] = new NamedColorSpace(name, labCS.toColor(colorvalue, 1.0f), profileName, profileURI); + break; + default: + throw new UnsupportedOperationException("PCS type is not supported: " + profile.getPCSType()); + } + } + return result; + } + + private int[] readUInt16Array(DataInput din, int count) throws IOException { + if (count == 0) { + return new int[0]; + } + int[] result = new int[count]; + for (int i = 0; i < count; i++) { + int v = din.readUnsignedShort(); + result[i] = v; + } + return result; + } + + private String readAscii(DataInput in, int maxLength) throws IOException { + byte[] data = new byte[maxLength]; + in.readFully(data); + String result = new String(data, "US-ASCII"); + int idx = result.indexOf('\0'); + if (idx >= 0) { + result = result.substring(0, idx); + } + return result; + } + + private String readSimpleString(byte[] tag) throws IOException { + DataInput din = new DataInputStream(new ByteArrayInputStream(tag)); + int sig = din.readInt(); + if (sig == MLUC) { + return readMLUC(din); + } else { + return null; //Unsupported tag structure type + } + } + + private String readMLUC(DataInput din) throws IOException { + din.skipBytes(16); + int firstLength = din.readInt(); + int firstOffset = din.readInt(); + int offset = 28; + din.skipBytes(firstOffset - offset); + byte[] utf16 = new byte[firstLength]; + din.readFully(utf16); + return new String(utf16, "UTF-16BE"); + } + + private String toSignatureString(int sig) { + StringBuffer sb = new StringBuffer(); + sb.append((char) (sig >> 24 & 0xFF)); + sb.append((char) (sig >> 16 & 0xFF)); + sb.append((char) (sig >> 8 & 0xFF)); + sb.append((char) (sig & 0xFF)); + return sb.toString(); + } + +} diff --git a/src/main/java/io/sf/graphics/java2d/color/profile/package-info.java b/src/main/java/io/sf/graphics/java2d/color/profile/package-info.java new file mode 100644 index 0000000..2ccab9e --- /dev/null +++ b/src/main/java/io/sf/graphics/java2d/color/profile/package-info.java @@ -0,0 +1,26 @@ +/* + * + * See the NOTICE file distributed with this work for additional + * information regarding copyright ownership. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ +/** + * Additional code around the topic of color profiles. + *

+ * Provides classes around the topic of color profiles, like support for the + * deprecated ICC named color profiles. + *

+ */ +package io.sf.graphics.java2d.color.profile; diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java new file mode 100644 index 0000000..8210f0a --- /dev/null +++ b/src/main/java/module-info.java @@ -0,0 +1,29 @@ +/* + * + * See the NOTICE file distributed with this work for additional + * information regarding copyright ownership. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ +/** + * Legacy color conversions (adapted from xmlgraphics-commons). + */ +module io.sf.graphics.legacy.colors { + + exports io.sf.graphics.java2d.color.profile; + exports io.sf.graphics.java2d.color; + + requires transitive java.desktop; + +} diff --git a/src/test/java/io/sf/graphics/java2d/ColorConverterTestCase.java b/src/test/java/io/sf/graphics/java2d/ColorConverterTestCase.java new file mode 100644 index 0000000..b44408d --- /dev/null +++ b/src/test/java/io/sf/graphics/java2d/ColorConverterTestCase.java @@ -0,0 +1,57 @@ +/* + * + * See the NOTICE file distributed with this work for additional + * information regarding copyright ownership. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ +/* $Id$ */ + +package io.sf.graphics.java2d; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; + +import java.awt.Color; +import java.awt.color.ColorSpace; + +import org.junit.jupiter.api.Test; + +import io.sf.graphics.java2d.color.ColorConverter; +import io.sf.graphics.java2d.color.ColorSpaceOrigin; +import io.sf.graphics.java2d.color.ColorSpaces; +import io.sf.graphics.java2d.color.GrayScaleColorConverter; + +public class ColorConverterTestCase { + + @Test + public void testToGray() throws Exception { + ColorConverter converter = GrayScaleColorConverter.getInstance(); + Color rgb = new Color(255, 184, 0); + Color gray = converter.convert(rgb); + + ColorSpaceOrigin origin = ColorSpaces.getColorSpaceOrigin(gray.getColorSpace()); + assertEquals("#CMYK", origin.getProfileName()); + assertNull(origin.getProfileURI()); + assertEquals(ColorSpace.TYPE_CMYK, gray.getColorSpace().getType()); + float[] comps = gray.getColorComponents(null); + assertEquals(4, comps.length); + assertEquals(0.0f, comps[0], 0.1f); + assertEquals(0.0f, comps[1], 0.1f); + assertEquals(0.0f, comps[2], 0.1f); + assertEquals(0.273f, comps[3], 0.01f); + assertEquals(0xFFB9B9B9, gray.getRGB()); + } + +} diff --git a/src/test/java/io/sf/graphics/java2d/ColorWithAlternativesTestCase.java b/src/test/java/io/sf/graphics/java2d/ColorWithAlternativesTestCase.java new file mode 100644 index 0000000..2423c17 --- /dev/null +++ b/src/test/java/io/sf/graphics/java2d/ColorWithAlternativesTestCase.java @@ -0,0 +1,80 @@ +/* + * + * See the NOTICE file distributed with this work for additional + * information regarding copyright ownership. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ +/* $Id$ */ + +package io.sf.graphics.java2d; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.awt.Color; + +import org.junit.jupiter.api.Test; + +import io.sf.graphics.java2d.color.CIELabColorSpace; +import io.sf.graphics.java2d.color.ColorSpaces; +import io.sf.graphics.java2d.color.ColorUtil; +import io.sf.graphics.java2d.color.ColorWithAlternatives; + +/** + * Tests the {@link ColorWithAlternatives} class. + */ +public class ColorWithAlternativesTestCase { + + @Test + public void testEquals() throws Exception { + Color col1 = new ColorWithAlternatives(255, 204, 0, null); + Color col2 = new Color(255, 204, 0); + + assertEquals(col1, col2); + assertEquals(col2, col1); + + CIELabColorSpace lab = ColorSpaces.getCIELabColorSpaceD50(); + Color postgelbLab = lab.toColor(83.25f, 16.45f, 96.89f, 1.0f); + col1 = new ColorWithAlternatives(255, 204, 0, new Color[] { postgelbLab }); + + //java.awt.Color tests on the sRGB value only + assertEquals(col1, col2); + assertEquals(col2, col1); + } + + @Test + public void testSameColor() throws Exception { + Color col1 = new ColorWithAlternatives(255, 204, 0, null); + Color col2 = new Color(255, 204, 0); + + //No alternatives. Only sRGB counts. + assertTrue(ColorUtil.isSameColor(col1, col2)); + + CIELabColorSpace lab = ColorSpaces.getCIELabColorSpaceD50(); + Color postgelbLab = lab.toColor(83.25f, 16.45f, 96.89f, 1.0f); + col1 = new ColorWithAlternatives(255, 204, 0, new Color[] { postgelbLab }); + + //Same sRGB value but one color with alternatives: + assertFalse(ColorUtil.isSameColor(col1, col2)); + + //Once the spotcolor naked and once as part of a color with alternatives + assertFalse(ColorUtil.isSameColor(postgelbLab, col1)); + + //sRGB values is calculated from Lab color and doesn't exactly match the selected fallback + assertFalse(postgelbLab.equals(col1)); + } + +} diff --git a/src/test/java/io/sf/graphics/java2d/NamedColorTestCase.java b/src/test/java/io/sf/graphics/java2d/NamedColorTestCase.java new file mode 100644 index 0000000..67423f9 --- /dev/null +++ b/src/test/java/io/sf/graphics/java2d/NamedColorTestCase.java @@ -0,0 +1,100 @@ +/* + * + * See the NOTICE file distributed with this work for additional + * information regarding copyright ownership. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ +/* $Id$ */ + +package io.sf.graphics.java2d; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; + +import java.awt.Color; + +import org.junit.jupiter.api.Test; + +import io.sf.graphics.java2d.color.CIELabColorSpace; +import io.sf.graphics.java2d.color.ColorSpaces; +import io.sf.graphics.java2d.color.NamedColorSpace; + +/** + * Tests named color spaces (and the CIE Lab color space implementation). + */ +public class NamedColorTestCase { + + private static final float POSTGELB_X = 0.6763079f; + private static final float POSTGELB_Y = 0.6263507f; + private static final float POSTGELB_Z = 0.04217565f; + + @Test + public void testNamedColorWithCIELab() { + CIELabColorSpace lab = ColorSpaces.getCIELabColorSpaceD50(); + + //CIE Lab definition of "Postgelb" (postal yellow) at D50 as defined by Swiss Post + //Convert to XYZ + float[] c1xyz = lab.toCIEXYZNative(83.25f, 16.45f, 96.89f); + //Verify XYZ values are OK + assertEquals(POSTGELB_X, c1xyz[0], 0.001f); + assertEquals(POSTGELB_Y, c1xyz[1], 0.001f); + assertEquals(POSTGELB_Z, c1xyz[2], 0.001f); + + //Build named color based on XYZ coordinates + NamedColorSpace ncs = new NamedColorSpace("Postgelb", c1xyz); + Color c1 = new Color(ncs, new float[] { 1.0f }, 1.0f); + + assertEquals(ncs, c1.getColorSpace()); + float[] comp = c1.getColorComponents(null); + assertEquals(1, comp.length); + assertEquals(1.0f, comp[0], 0.001f); + float[] xyz = ncs.toCIEXYZ(new float[] { 1.0f }); + for (int i = 0; i < 3; i++) { + assertEquals(c1xyz[i], xyz[i], 0.001f); + } + + //NOTE: Allowing for some fuzziness due to differences in XYZ->sRGB calculation between + //Java 1.5 and 6. + assertEquals(254, c1.getRed(), 1f); + assertEquals(195, c1.getGreen(), 2f); + assertEquals(0, c1.getBlue()); + } + + @Test + public void testEquals() { + NamedColorSpace ncs1 = new NamedColorSpace("Postgelb", new float[] { POSTGELB_X, POSTGELB_Y, POSTGELB_Z }); + + NamedColorSpace ncs2 = new NamedColorSpace("Postgelb", new float[] { POSTGELB_X, POSTGELB_Y, POSTGELB_Z }); + + assertEquals(ncs1, ncs2); + + //Construct the same NamedColorSpace via two different methods + CIELabColorSpace lab = ColorSpaces.getCIELabColorSpaceD50(); + Color postgelbLab = lab.toColor(83.25f, 16.45f, 96.89f, 1.0f); + float[] xyz = lab.toCIEXYZ(postgelbLab.getColorComponents(null)); + xyz[0] = POSTGELB_X; + xyz[1] = POSTGELB_Y; + xyz[2] = POSTGELB_Z; + ncs1 = new NamedColorSpace("Postgelb", postgelbLab); + ncs2 = new NamedColorSpace("Postgelb", xyz); + assertEquals(ncs1, ncs2); + + //Compare with a similar color coming from sRGB + Color rgb = new Color(255, 184, 0); + ncs2 = new NamedColorSpace("PostgelbFromRGB", rgb); + assertFalse(ncs1.equals(ncs2)); + } + +} diff --git a/src/test/java/io/sf/graphics/java2d/color/profile/ColorProfileUtilTestCase.java b/src/test/java/io/sf/graphics/java2d/color/profile/ColorProfileUtilTestCase.java new file mode 100644 index 0000000..39d2178 --- /dev/null +++ b/src/test/java/io/sf/graphics/java2d/color/profile/ColorProfileUtilTestCase.java @@ -0,0 +1,45 @@ +/* + * + * See the NOTICE file distributed with this work for additional + * information regarding copyright ownership. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ +/* $Id$ */ + +package io.sf.graphics.java2d.color.profile; + +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.awt.color.ColorSpace; +import java.awt.color.ICC_Profile; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; + +import org.junit.jupiter.api.Test; + +public class ColorProfileUtilTestCase { + + @Test + public void testIsDefaultsRGB() throws IOException { + ICC_Profile profile = ICC_Profile.getInstance(ColorSpace.CS_sRGB); + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + profile.write(baos); + ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray()); + ICC_Profile profileFromFile = ICC_Profile.getInstance(bais); + assertTrue(ColorProfileUtil.isDefaultsRGB(profileFromFile)); + } + +} diff --git a/src/test/java/io/sf/graphics/java2d/color/profile/NamedColorProfileParserTestCase.java b/src/test/java/io/sf/graphics/java2d/color/profile/NamedColorProfileParserTestCase.java new file mode 100644 index 0000000..17c0ea9 --- /dev/null +++ b/src/test/java/io/sf/graphics/java2d/color/profile/NamedColorProfileParserTestCase.java @@ -0,0 +1,71 @@ +/* + * + * See the NOTICE file distributed with this work for additional + * information regarding copyright ownership. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ +/* $Id$ */ + +package io.sf.graphics.java2d.color.profile; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; + +import java.awt.color.ICC_Profile; +import java.io.InputStream; + +import org.apache.commons.io.IOUtils; +import org.junit.jupiter.api.Test; + +import io.sf.graphics.java2d.color.NamedColorSpace; +import io.sf.graphics.java2d.color.RenderingIntent; + +/** + * Tests the {@link NamedColorProfileParser}. + */ +public class NamedColorProfileParserTestCase { + + private static final String NCP_EXAMPLE_FILE = "ncp-example.icc"; + + @Test + public void testParser() throws Exception { + InputStream in = getClass().getResourceAsStream(NCP_EXAMPLE_FILE); + assertNotNull(in, NCP_EXAMPLE_FILE + " is missing!"); + ICC_Profile iccProfile; + try { + iccProfile = ICC_Profile.getInstance(in); + } finally { + IOUtils.closeQuietly(in); + } + NamedColorProfileParser parser = new NamedColorProfileParser(); + NamedColorProfile ncp = parser.parseProfile(iccProfile); + assertEquals("Named Color Profile Example", ncp.getProfileName()); + assertEquals("The Apache Software Foundation", ncp.getCopyright()); + assertEquals(RenderingIntent.PERCEPTUAL, ncp.getRenderingIntent()); + NamedColorSpace[] namedColors = ncp.getNamedColors(); + assertEquals(2, namedColors.length); + NamedColorSpace ncs; + ncs = namedColors[0]; + assertEquals("Postgelb", ncs.getColorName()); + float[] xyz = ncs.getXYZ(); + assertEquals(0.6763079f, xyz[0], 0.01f); + assertEquals(0.6263507f, xyz[1], 0.01f); + assertEquals(0.04217565f, xyz[2], 0.01f); + + ncs = namedColors[1]; + assertEquals("MyRed", ncs.getColorName()); + } + +} diff --git a/src/test/resources/io/sf/graphics/java2d/color/profile/ncp-example.icc b/src/test/resources/io/sf/graphics/java2d/color/profile/ncp-example.icc new file mode 100644 index 0000000000000000000000000000000000000000..7afb2d8fc3e9262cc7d529a60fb496661a56c724 GIT binary patch literal 532 zcmbVIu};G<6ueZWWuOv6w^AtsBPF()WZ2)xT$+mU&p)$%mZ8^ zK?aEwAx6ldm<4gfGshfHR3!Nr&)#V~M@`S6?|FqsUvmn>8nI!q?`N^3R`~ZbDhp`N zPGC7HhjzPU5616~s=rh!&&>{h_`g7um-a!bSzYnXYjm_Tzj&F*w9Z0(u