Author: lehmi
Date: Sun Jan 22 16:04:22 2023
New Revision: 1906930
URL: http://svn.apache.org/viewvc?rev=1906930&view=rev
Log:
PDFGOX-5558: replaced ICC-profile for CMYK conversion to get better results as
proposed by Etienne Gautier
Added:
pdfbox/trunk/pdfbox/src/main/resources/org/apache/pdfbox/resources/icc/CGATS001Compat-v2-micro.icc
(with props)
Removed:
pdfbox/trunk/pdfbox/src/main/resources/org/apache/pdfbox/resources/icc/ISOcoated_v2_300_bas.icc
Modified:
pdfbox/trunk/pdfbox/src/main/appended-resources/META-INF/LICENSE
pdfbox/trunk/pdfbox/src/main/appended-resources/META-INF/NOTICE
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDDeviceCMYK.java
Modified: pdfbox/trunk/pdfbox/src/main/appended-resources/META-INF/LICENSE
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/appended-resources/META-INF/LICENSE?rev=1906930&r1=1906929&r2=1906930&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/appended-resources/META-INF/LICENSE (original)
+++ pdfbox/trunk/pdfbox/src/main/appended-resources/META-INF/LICENSE Sun Jan 22
16:04:22 2023
@@ -739,3 +739,138 @@ Font Awesome (http://fontawesome.io):
public licenses.
Creative Commons may be contacted at creativecommons.org.
+
+
+CMYK ICC Profile (https://github.com/saucecontrol/Compact-ICC-Profiles):
+ CC0 1.0 Universal
+
+ Statement of Purpose
+
+ The laws of most jurisdictions throughout the world automatically confer
+ exclusive Copyright and Related Rights (defined below) upon the creator and
+ subsequent owner(s) (each and all, an "owner") of an original work of
+ authorship and/or a database (each, a "Work").
+
+ Certain owners wish to permanently relinquish those rights to a Work for
the
+ purpose of contributing to a commons of creative, cultural and scientific
+ works ("Commons") that the public can reliably and without fear of later
+ claims of infringement build upon, modify, incorporate in other works,
reuse
+ and redistribute as freely as possible in any form whatsoever and for any
+ purposes, including without limitation commercial purposes. These owners
may
+ contribute to the Commons to promote the ideal of a free culture and the
+ further production of creative, cultural and scientific works, or to gain
+ reputation or greater distribution for their Work in part through the use
and
+ efforts of others.
+
+ For these and/or other purposes and motivations, and without any
expectation
+ of additional consideration or compensation, the person associating CC0
with a
+ Work (the "Affirmer"), to the extent that he or she is an owner of
Copyright
+ and Related Rights in the Work, voluntarily elects to apply CC0 to the Work
+ and publicly distribute the Work under its terms, with knowledge of his or
her
+ Copyright and Related Rights in the Work and the meaning and intended legal
+ effect of CC0 on those rights.
+
+ 1. Copyright and Related Rights. A Work made available under CC0 may be
+ protected by copyright and related or neighboring rights ("Copyright and
+ Related Rights"). Copyright and Related Rights include, but are not limited
+ to, the following:
+
+ i. the right to reproduce, adapt, distribute, perform, display,
communicate,
+ and translate a Work;
+
+ ii. moral rights retained by the original author(s) and/or performer(s);
+
+ iii. publicity and privacy rights pertaining to a person's image or
likeness
+ depicted in a Work;
+
+ iv. rights protecting against unfair competition in regards to a Work,
+ subject to the limitations in paragraph 4(a), below;
+
+ v. rights protecting the extraction, dissemination, use and reuse of
data in
+ a Work;
+
+ vi. database rights (such as those arising under Directive 96/9/EC of the
+ European Parliament and of the Council of 11 March 1996 on the legal
+ protection of databases, and under any national implementation thereof,
+ including any amended or successor version of such directive); and
+
+ vii. other similar, equivalent or corresponding rights throughout the
world
+ based on applicable law or treaty, and any national implementations
thereof.
+
+ 2. Waiver. To the greatest extent permitted by, but not in contravention
of,
+ applicable law, Affirmer hereby overtly, fully, permanently, irrevocably
and
+ unconditionally waives, abandons, and surrenders all of Affirmer's
Copyright
+ and Related Rights and associated claims and causes of action, whether now
+ known or unknown (including existing as well as future claims and causes of
+ action), in the Work (i) in all territories worldwide, (ii) for the maximum
+ duration provided by applicable law or treaty (including future time
+ extensions), (iii) in any current or future medium and for any number of
+ copies, and (iv) for any purpose whatsoever, including without limitation
+ commercial, advertising or promotional purposes (the "Waiver"). Affirmer
makes
+ the Waiver for the benefit of each member of the public at large and to the
+ detriment of Affirmer's heirs and successors, fully intending that such
Waiver
+ shall not be subject to revocation, rescission, cancellation, termination,
or
+ any other legal or equitable action to disrupt the quiet enjoyment of the
Work
+ by the public as contemplated by Affirmer's express Statement of Purpose.
+
+ 3. Public License Fallback. Should any part of the Waiver for any reason be
+ judged legally invalid or ineffective under applicable law, then the Waiver
+ shall be preserved to the maximum extent permitted taking into account
+ Affirmer's express Statement of Purpose. In addition, to the extent the
Waiver
+ is so judged Affirmer hereby grants to each affected person a royalty-free,
+ non transferable, non sublicensable, non exclusive, irrevocable and
+ unconditional license to exercise Affirmer's Copyright and Related Rights
in
+ the Work (i) in all territories worldwide, (ii) for the maximum duration
+ provided by applicable law or treaty (including future time extensions),
(iii)
+ in any current or future medium and for any number of copies, and (iv) for
any
+ purpose whatsoever, including without limitation commercial, advertising or
+ promotional purposes (the "License"). The License shall be deemed
effective as
+ of the date CC0 was applied by Affirmer to the Work. Should any part of the
+ License for any reason be judged legally invalid or ineffective under
+ applicable law, such partial invalidity or ineffectiveness shall not
+ invalidate the remainder of the License, and in such case Affirmer hereby
+ affirms that he or she will not (i) exercise any of his or her remaining
+ Copyright and Related Rights in the Work or (ii) assert any associated
claims
+ and causes of action with respect to the Work, in either case contrary to
+ Affirmer's express Statement of Purpose.
+
+ 4. Limitations and Disclaimers.
+
+ a. No trademark or patent rights held by Affirmer are waived, abandoned,
+ surrendered, licensed or otherwise affected by this document.
+
+ b. Affirmer offers the Work as-is and makes no representations or
warranties
+ of any kind concerning the Work, express, implied, statutory or
otherwise,
+ including without limitation warranties of title, merchantability,
fitness
+ for a particular purpose, non infringement, or the absence of latent or
+ other defects, accuracy, or the present or absence of errors, whether or
not
+ discoverable, all to the greatest extent permissible under applicable
law.
+
+ c. Affirmer disclaims responsibility for clearing rights of other persons
+ that may apply to the Work or any use thereof, including without
limitation
+ any person's Copyright and Related Rights in the Work. Further, Affirmer
+ disclaims responsibility for obtaining any necessary consents,
permissions
+ or other rights required for any use of the Work.
+
+ d. Affirmer understands and acknowledges that Creative Commons is not a
+ party to this document and has no duty or obligation with respect to this
+ CC0 or use of the Work.
+
+ For more information, please see
+ http://creativecommons.org/publicdomain/zero/1.0/
+ Footer
+ © 2023 GitHub, Inc.
+ Footer navigation
+
+ Terms
+ Privacy
+ Security
+ Status
+ Docs
+ Contact GitHub
+ Pricing
+ API
+ Training
+ Blog
+ About
+
Modified: pdfbox/trunk/pdfbox/src/main/appended-resources/META-INF/NOTICE
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/appended-resources/META-INF/NOTICE?rev=1906930&r1=1906929&r2=1906930&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/appended-resources/META-INF/NOTICE (original)
+++ pdfbox/trunk/pdfbox/src/main/appended-resources/META-INF/NOTICE Sun Jan 22
16:04:22 2023
@@ -12,3 +12,8 @@ Copyright 1991-2015 Unicode, Inc.
Includes parts of TwelveMonkeys ImageIO
Copyright 2008-2016 Harald Kuhr
+
+Includes the CMYK ICC-profile (CGATS001Compat-v2-micro.icc)
+https://github.com/saucecontrol/Compact-ICC-Profiles
+Released to the public domain under the Creative Commons CC0 license by
Clinton Ingram, saucecontrol
+
\ No newline at end of file
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDDeviceCMYK.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDDeviceCMYK.java?rev=1906930&r1=1906929&r2=1906930&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDDeviceCMYK.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDDeviceCMYK.java
Sun Jan 22 16:04:22 2023
@@ -98,10 +98,10 @@ public class PDDeviceCMYK extends PDDevi
{
// Adobe Acrobat uses "U.S. Web Coated (SWOP) v2" as the default
// CMYK profile, however it is not available under an open license.
- // Instead, the "ISO Coated v2 300% (basICColor)" is used, which
- // is an open alternative to the "ISO Coated v2 300% (ECI)" profile.
+ // Instead, the "CGATS001Compat-v2-micro" is used, which is an open
+ // alternative to the "U.S. Web Coated (SWOP) v2" profile.
- String resourceName =
"/org/apache/pdfbox/resources/icc/ISOcoated_v2_300_bas.icc";
+ String resourceName =
"/org/apache/pdfbox/resources/icc/CGATS001Compat-v2-micro.icc";
InputStream resourceAsStream =
PDDeviceCMYK.class.getResourceAsStream(resourceName);
if (resourceAsStream == null)
{
Added:
pdfbox/trunk/pdfbox/src/main/resources/org/apache/pdfbox/resources/icc/CGATS001Compat-v2-micro.icc
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/resources/org/apache/pdfbox/resources/icc/CGATS001Compat-v2-micro.icc?rev=1906930&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
pdfbox/trunk/pdfbox/src/main/resources/org/apache/pdfbox/resources/icc/CGATS001Compat-v2-micro.icc
------------------------------------------------------------------------------
svn:mime-type = application/vnd.iccprofile
