You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by le...@apache.org on 2016/11/23 15:57:14 UTC
svn commit: r1770993 - in /pdfbox/branches/1.8: ./
examples/src/main/java/org/apache/pdfbox/examples/pdfa/
examples/src/main/resources/org/apache/pdfbox/resources/pdfa/ pdfbox/
pdfbox/src/test/java/org/apache/pdfbox/pdmodel/
pdfbox/src/test/resources/o...
Author: lehmi
Date: Wed Nov 23 15:57:13 2016
New Revision: 1770993
URL: http://svn.apache.org/viewvc?rev=1770993&view=rev
Log:
PDFBOX-3571: replaced sRGG color profile due to a license issue
Added:
pdfbox/branches/1.8/examples/src/main/resources/org/apache/pdfbox/resources/pdfa/sRGB.icc (with props)
pdfbox/branches/1.8/examples/src/main/resources/org/apache/pdfbox/resources/pdfa/sRGB.icc.COPYING
pdfbox/branches/1.8/examples/src/main/resources/org/apache/pdfbox/resources/pdfa/sRGB.icc.LICENSE-ZLIB
pdfbox/branches/1.8/examples/src/main/resources/org/apache/pdfbox/resources/pdfa/sRGB.icc.README
pdfbox/branches/1.8/pdfbox/src/test/resources/org/apache/pdfbox/pdmodel/sRGB.icc
- copied unchanged from r1770988, pdfbox/trunk/pdfbox/src/test/resources/org/apache/pdfbox/pdmodel/sRGB.icc
pdfbox/branches/1.8/pdfbox/src/test/resources/org/apache/pdfbox/pdmodel/sRGB.icc.COPYING
- copied unchanged from r1770988, pdfbox/trunk/pdfbox/src/test/resources/org/apache/pdfbox/pdmodel/sRGB.icc.COPYING
pdfbox/branches/1.8/pdfbox/src/test/resources/org/apache/pdfbox/pdmodel/sRGB.icc.LICENSE-ZLIB
- copied unchanged from r1770988, pdfbox/trunk/pdfbox/src/test/resources/org/apache/pdfbox/pdmodel/sRGB.icc.LICENSE-ZLIB
pdfbox/branches/1.8/pdfbox/src/test/resources/org/apache/pdfbox/pdmodel/sRGB.icc.README
- copied unchanged from r1770988, pdfbox/trunk/pdfbox/src/test/resources/org/apache/pdfbox/pdmodel/sRGB.icc.README
Removed:
pdfbox/branches/1.8/examples/src/main/resources/org/apache/pdfbox/resources/pdfa/sRGB Color Space Profile.icm
pdfbox/branches/1.8/examples/src/main/resources/org/apache/pdfbox/resources/pdfa/sRGB Color Space Profile.icm.LICENSE.txt
pdfbox/branches/1.8/pdfbox/src/test/resources/org/apache/pdfbox/pdmodel/sRGB Color Space Profile.icm
pdfbox/branches/1.8/pdfbox/src/test/resources/org/apache/pdfbox/pdmodel/sRGB Color Space Profile.icm.LICENSE.txt
Modified:
pdfbox/branches/1.8/ (props changed)
pdfbox/branches/1.8/examples/src/main/java/org/apache/pdfbox/examples/pdfa/CreatePDFA.java
pdfbox/branches/1.8/pdfbox/ (props changed)
pdfbox/branches/1.8/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/TestPDDocumentCatalog.java
Propchange: pdfbox/branches/1.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov 23 15:57:13 2016
@@ -1 +1 @@
-/pdfbox/trunk:1460370,1460372,1461796,1465163,1465217,1465266,1465359-1465360,1465366,1467638,1468195,1469999,1470107,1470242,1476795,1477806,1478472,1479136,1479287,1480000,1480030,1484089,1484277,1484547,1485771,1485781,1486337,1486413,1486423,1486440,1487557,1488049,1490022-1490023,1490408,1493503,1494083,1495799,1495802-1495803,1497532,1504210,1504214,1505737,1509187,1512367,1512433,1512661,1515101,1515165,1515905,1517273,1517281,1517288,1519174,1521194,1528826,1528833,1530018,1530740,1535953,1535956,1536136,1536173,1536441,1536463,1537287,1538191,1538203,1538222,1538341,1538371,1538394-1538395,1540801,1540811,1541625,1541714,1541987,1542291,1542780,1544789,1544806,1544818,1544972,1544977,1548387,1548394,1549022,1549025,1549027,1551220,1552521,1552533,1552552,1553017,1553175,1553220,1554632,1554774,1554792,1554845,1555186,1555345,1555550,1557339,1557374,1557546,1557553,1557561,1557793,1558205,1558570,1561095,1561191,1563199,1563210,1563215,1563426,1563429,1564846,1588736,1598655
,1598885,1599016,1599656,1599786,1601144,1601451,1614078,1640355-1640356,1640513
+/pdfbox/trunk:1460370,1460372,1461796,1465163,1465217,1465266,1465359-1465360,1465366,1467638,1468195,1469999,1470107,1470242,1476795,1477806,1478472,1479136,1479287,1480000,1480030,1484089,1484277,1484547,1485771,1485781,1486337,1486413,1486423,1486440,1487557,1488049,1490022-1490023,1490408,1493503,1494083,1495799,1495802-1495803,1497532,1504210,1504214,1505737,1509187,1512367,1512433,1512661,1515101,1515165,1515905,1517273,1517281,1517288,1519174,1521194,1528826,1528833,1530018,1530740,1535953,1535956,1536136,1536173,1536441,1536463,1537287,1538191,1538203,1538222,1538341,1538371,1538394-1538395,1540801,1540811,1541625,1541714,1541987,1542291,1542780,1544789,1544806,1544818,1544972,1544977,1548387,1548394,1549022,1549025,1549027,1551220,1552521,1552533,1552552,1553017,1553175,1553220,1554632,1554774,1554792,1554845,1555186,1555345,1555550,1557339,1557374,1557546,1557553,1557561,1557793,1558205,1558570,1561095,1561191,1563199,1563210,1563215,1563426,1563429,1564846,1588736,1598655
,1598885,1599016,1599656,1599786,1601144,1601451,1614078,1640355-1640356,1640513,1770988
Modified: pdfbox/branches/1.8/examples/src/main/java/org/apache/pdfbox/examples/pdfa/CreatePDFA.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/1.8/examples/src/main/java/org/apache/pdfbox/examples/pdfa/CreatePDFA.java?rev=1770993&r1=1770992&r2=1770993&view=diff
==============================================================================
--- pdfbox/branches/1.8/examples/src/main/java/org/apache/pdfbox/examples/pdfa/CreatePDFA.java (original)
+++ pdfbox/branches/1.8/examples/src/main/java/org/apache/pdfbox/examples/pdfa/CreatePDFA.java Wed Nov 23 15:57:13 2016
@@ -112,7 +112,8 @@ public class CreatePDFA
System.err.println(xmpException.getMessage());
}
- InputStream colorProfile = CreatePDFA.class.getResourceAsStream("/org/apache/pdfbox/resources/pdfa/sRGB Color Space Profile.icm");
+ InputStream colorProfile = CreatePDFA.class
+ .getResourceAsStream("/org/apache/pdfbox/resources/pdfa/sRGB.icc");
// create output intent
PDOutputIntent oi = new PDOutputIntent(doc, colorProfile);
oi.setInfo("sRGB IEC61966-2.1");
Added: pdfbox/branches/1.8/examples/src/main/resources/org/apache/pdfbox/resources/pdfa/sRGB.icc
URL: http://svn.apache.org/viewvc/pdfbox/branches/1.8/examples/src/main/resources/org/apache/pdfbox/resources/pdfa/sRGB.icc?rev=1770993&view=auto
==============================================================================
Binary file - no diff available.
Propchange: pdfbox/branches/1.8/examples/src/main/resources/org/apache/pdfbox/resources/pdfa/sRGB.icc
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: pdfbox/branches/1.8/examples/src/main/resources/org/apache/pdfbox/resources/pdfa/sRGB.icc.COPYING
URL: http://svn.apache.org/viewvc/pdfbox/branches/1.8/examples/src/main/resources/org/apache/pdfbox/resources/pdfa/sRGB.icc.COPYING?rev=1770993&view=auto
==============================================================================
--- pdfbox/branches/1.8/examples/src/main/resources/org/apache/pdfbox/resources/pdfa/sRGB.icc.COPYING (added)
+++ pdfbox/branches/1.8/examples/src/main/resources/org/apache/pdfbox/resources/pdfa/sRGB.icc.COPYING Wed Nov 23 15:57:13 2016
@@ -0,0 +1,45 @@
+The profiles in the base directory are provided according to different licenses.
+
+
+Group A
+sRGB, LCMSLAB.ICM, LCMSXYZ.ICM, the compatibleWithAdobeRGB.icc and the
+Gray.icc, CineonLog_M*.icc, CineLogCurve.icc profiles are all zlib licensed.
+Even though it is highly recommended to rename them before editing.
+
+
+Group B
+The eciRGB*.icc profiles come with their license in license.rtf.
+
+
+Group C
+PhotoGamutRGB_avg6c.icc is licensed to be distributed freely. Modifications
+are not allowed.
+
+
+
+Additionally all profiles come with the following disclaimer. The provided
+ICC Profiles in the package are called DATA in the folling statement.
+
+
+ NO WARRANTY
+
+ BECAUSE THE DATA IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE DATA, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE DATA "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE DATA IS WITH YOU. SHOULD THE
+DATA PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE DATA AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE DATA (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE DATA TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
Added: pdfbox/branches/1.8/examples/src/main/resources/org/apache/pdfbox/resources/pdfa/sRGB.icc.LICENSE-ZLIB
URL: http://svn.apache.org/viewvc/pdfbox/branches/1.8/examples/src/main/resources/org/apache/pdfbox/resources/pdfa/sRGB.icc.LICENSE-ZLIB?rev=1770993&view=auto
==============================================================================
--- pdfbox/branches/1.8/examples/src/main/resources/org/apache/pdfbox/resources/pdfa/sRGB.icc.LICENSE-ZLIB (added)
+++ pdfbox/branches/1.8/examples/src/main/resources/org/apache/pdfbox/resources/pdfa/sRGB.icc.LICENSE-ZLIB Wed Nov 23 15:57:13 2016
@@ -0,0 +1,23 @@
+The zlib/libpng License
+
+Copyright (c) 2008 Kai-Uwe Behrmann
+
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source
+ distribution.
+
Added: pdfbox/branches/1.8/examples/src/main/resources/org/apache/pdfbox/resources/pdfa/sRGB.icc.README
URL: http://svn.apache.org/viewvc/pdfbox/branches/1.8/examples/src/main/resources/org/apache/pdfbox/resources/pdfa/sRGB.icc.README?rev=1770993&view=auto
==============================================================================
--- pdfbox/branches/1.8/examples/src/main/resources/org/apache/pdfbox/resources/pdfa/sRGB.icc.README (added)
+++ pdfbox/branches/1.8/examples/src/main/resources/org/apache/pdfbox/resources/pdfa/sRGB.icc.README Wed Nov 23 15:57:13 2016
@@ -0,0 +1,12 @@
+Included are profiles created by Marti Maria (littleCMS) <http://www.littlecms.com>:
+
+ # CIE*Lab
+ # CIE*XYZ
+ # sRGB
+
+Various contributors:
+
+ # LStar-RGB from ColorSolutions <http://hwww.basICColor.com>
+ # Photogamut-RGB from the Photogamut workgroup <http://www.photogamut.org>
+ # Cineon and Gray from Kai-Uwe Behrmann <http://www.behrmann.name>
+ # compatibleWithAdobeRGB1998 from Graeme Gill <http://www.argyllcms.com>
Propchange: pdfbox/branches/1.8/pdfbox/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov 23 15:57:13 2016
@@ -1 +1 @@
-/pdfbox/trunk/pdfbox:1460370,1460372,1461796,1465163,1465217,1465266,1465359-1465360,1465366,1467638,1468195,1469999,1470107,1470242,1476795,1477806,1478472,1479136,1479287,1480000,1480030,1484089,1484277,1484547,1485771,1485781,1486337,1486413,1486423,1486440,1487557,1488049,1490022-1490023,1490408,1493503,1494083,1495799,1495802-1495803,1497532,1504210,1504214,1505737,1509187,1512367,1512433,1512661,1515101,1515165,1515905,1517273,1517281,1517288,1519174,1521194,1528826,1528833,1530018,1530740,1535953,1535956,1536136,1536173,1536441,1536463,1537287,1538191,1538203,1538222,1538341,1538371,1538394-1538395,1540801,1540811,1541625,1541714,1541987,1542291,1542780,1544789,1544806,1544818,1544972,1544977,1548387,1548394,1549022,1549025,1549027,1551220,1552521,1552533,1552552,1553017,1553175,1553220,1554632,1554774,1554792,1554845,1555186,1555345,1555550,1557339,1557374,1557546,1557553,1557561,1557793,1558205,1558570,1561095,1561191,1563199,1563210,1563215,1563426,1563429,1564846,1588736,
1598655,1598885,1599016,1599656,1599786,1601144,1601451,1631169
+/pdfbox/trunk/pdfbox:1460370,1460372,1461796,1465163,1465217,1465266,1465359-1465360,1465366,1467638,1468195,1469999,1470107,1470242,1476795,1477806,1478472,1479136,1479287,1480000,1480030,1484089,1484277,1484547,1485771,1485781,1486337,1486413,1486423,1486440,1487557,1488049,1490022-1490023,1490408,1493503,1494083,1495799,1495802-1495803,1497532,1504210,1504214,1505737,1509187,1512367,1512433,1512661,1515101,1515165,1515905,1517273,1517281,1517288,1519174,1521194,1528826,1528833,1530018,1530740,1535953,1535956,1536136,1536173,1536441,1536463,1537287,1538191,1538203,1538222,1538341,1538371,1538394-1538395,1540801,1540811,1541625,1541714,1541987,1542291,1542780,1544789,1544806,1544818,1544972,1544977,1548387,1548394,1549022,1549025,1549027,1551220,1552521,1552533,1552552,1553017,1553175,1553220,1554632,1554774,1554792,1554845,1555186,1555345,1555550,1557339,1557374,1557546,1557553,1557561,1557793,1558205,1558570,1561095,1561191,1563199,1563210,1563215,1563426,1563429,1564846,1588736,
1598655,1598885,1599016,1599656,1599786,1601144,1601451,1631169,1770988
Modified: pdfbox/branches/1.8/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/TestPDDocumentCatalog.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/1.8/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/TestPDDocumentCatalog.java?rev=1770993&r1=1770992&r2=1770993&view=diff
==============================================================================
--- pdfbox/branches/1.8/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/TestPDDocumentCatalog.java (original)
+++ pdfbox/branches/1.8/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/TestPDDocumentCatalog.java Wed Nov 23 15:57:13 2016
@@ -108,7 +108,7 @@ public class TestPDDocumentCatalog exten
assertTrue(outputIntents.isEmpty());
// add an OutputIntent
- colorProfile = TestPDDocumentCatalog.class.getResourceAsStream("sRGB Color Space Profile.icm");
+ colorProfile = TestPDDocumentCatalog.class.getResourceAsStream("sRGB.icc");
// create output intent
PDOutputIntent oi = new PDOutputIntent(doc, colorProfile);
oi.setInfo("sRGB IEC61966-2.1");