Skip to content

Commit

Permalink
[RELEASE] Merge branch 'release/5.5.13'
Browse files Browse the repository at this point in the history
  • Loading branch information
amedee committed Jan 17, 2018
2 parents 3ca54cc + 5a41eb8 commit 0d1c72d
Show file tree
Hide file tree
Showing 24 changed files with 331 additions and 46 deletions.
2 changes: 1 addition & 1 deletion itext/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</parent>

<artifactId>itextpdf</artifactId>
<version>5.5.12</version>
<version>5.5.13</version>

<name>iText Core</name>
<description>A Free Java-PDF library</description>
Expand Down
69 changes: 37 additions & 32 deletions itext/src/main/java/com/itextpdf/text/Version.java
Original file line number Diff line number Diff line change
Expand Up @@ -70,14 +70,14 @@ public final class Version {
* This String contains the version number of this iText release.
* For debugging purposes, we request you NOT to change this constant.
*/
private String release = "5.5.12";
private String release = "5.5.13";
/**
* This String contains the iText version as shown in the producer line.
* iText is a product developed by iText Group NV.
* iText Group requests that you retain the iText producer line
* in every PDF that is created or manipulated using iText.
*/
private String iTextVersion = iText + " " + release + " \u00a92000-2017 iText Group NV";
private String iTextVersion = iText + " " + release + " \u00a92000-2018 iText Group NV";
/**
* The license key.
*/
Expand All @@ -93,46 +93,51 @@ public static Version getInstance() {
version = new Version();
synchronized ( version ) {
try {
Class<?> klass = Class.forName("com.itextpdf.license.LicenseKey");
Method m = klass.getMethod("getLicenseeInfo");
String[] info = (String[])m.invoke(klass.newInstance());
if (info[3] != null && info[3].trim().length() > 0) {
version.key = info[3];
} else {
version.key = "Trial version ";
if (info[5] == null) {
version.key += "unauthorised";
Class<?> klass = Class.forName("com.itextpdf.licensekey.LicenseKey");
if(klass != null) {
Class[] cArg = {String.class};
Method m = klass.getMethod("getLicenseeInfoForVersion",cArg);
Object[] args = {version.release};
String[] info = (String[]) m.invoke(klass.newInstance(),args);
if (info[3] != null && info[3].trim().length() > 0) {
version.key = info[3];
} else {
version.key += info[5];
version.key = "Trial version ";
if (info[5] == null) {
version.key += "unauthorised";
} else {
version.key += info[5];
}
}
}

if (info[4] != null && info[4].trim().length() > 0) {
version.iTextVersion = info[4];
} else if (info[2] != null && info[2].trim().length() > 0) {
version.iTextVersion += " (" + info[2];
if (!version.key.toLowerCase().startsWith("trial")) {
version.iTextVersion += "; licensed version)";
} else {
version.iTextVersion += "; " + version.key + ")";
}
} else if (info[0] != null && info[0].trim().length() > 0) {
// fall back to contact name, if company name is unavailable
version.iTextVersion += " (" + info[0];
if (!version.key.toLowerCase().startsWith("trial")) {
// we shouldn't have a licensed version without company name,
// but let's account for it anyway
version.iTextVersion += "; licensed version)";
if (info[4] != null && info[4].trim().length() > 0) {
version.iTextVersion = info[4];
} else if (info[2] != null && info[2].trim().length() > 0) {
version.iTextVersion += " (" + info[2];
if (!version.key.toLowerCase().startsWith("trial")) {
version.iTextVersion += "; licensed version)";
} else {
version.iTextVersion += "; " + version.key + ")";
}
} else if (info[0] != null && info[0].trim().length() > 0) {
// fall back to contact name, if company name is unavailable
version.iTextVersion += " (" + info[0];
if (!version.key.toLowerCase().startsWith("trial")) {
// we shouldn't have a licensed version without company name,
// but let's account for it anyway
version.iTextVersion += "; licensed version)";
} else {
version.iTextVersion += "; " + version.key + ")";
}
} else {
version.iTextVersion += "; " + version.key + ")";
throw new Exception();
}
} else {
throw new Exception();
}
} catch (Exception e) {
version.iTextVersion += AGPL;
}
}

}
return version;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -860,7 +860,7 @@ else if (codeRows > 90) {
pad = tot - lenErr - lenCodewords;
if ((options & PDF417_USE_MACRO) != 0) {
// the padding comes before the control block
System.arraycopy(codewords, macroIndex, codewords, macroIndex + pad, pad);
System.arraycopy(codewords, macroIndex, codewords, macroIndex + pad, lenCodewords - macroIndex);
cwPtr = lenCodewords + pad;
while (pad-- != 0)
codewords[macroIndex++] = TEXT_MODE;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1012,7 +1012,7 @@ protected void flatFields() {
markUsed(stream);
}
}
} else if (appDic != null && as_n != null) {
} else if (appDic != null && as_n != null && (as_n.isStream() || as_n.isDictionary())) {
PdfArray bbox = ((PdfDictionary) as_n).getAsArray(PdfName.BBOX);
PdfArray rect = merged.getAsArray(PdfName.RECT);
if (bbox != null && rect != null) {
Expand Down
16 changes: 16 additions & 0 deletions itext/src/main/java/com/itextpdf/text/pdf/codec/PngImage.java
Original file line number Diff line number Diff line change
Expand Up @@ -515,6 +515,7 @@ PdfObject getColorspace() {

Image getImage() throws IOException {
readPng();
checkIccProfile();
try {
int pal0 = 0;
int palIdx = 0;
Expand Down Expand Up @@ -875,6 +876,21 @@ int[] getPixel(byte curr[]) {
}
}
}

private int getExpectedIccNumberOfComponents() {
if (colorType == 0 || colorType == 4) {
return 1;
} else {
return 3;
}
}

private void checkIccProfile() {
if (icc_profile != null && icc_profile.getNumComponents() != getExpectedIccNumberOfComponents()) {
LoggerFactory.getLogger(getClass()).warn(MessageLocalization.getComposedMessage("unexpected.color.space.in.embedded.icc.profile"));
icc_profile = null;
}
}

private static void decodeSubFilter(byte[] curr, int count, int bpp) {
for (int i = bpp; i < count; i++) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -514,6 +514,7 @@ path.construction.operator.inside.text.object=Path construction or drawing opera
unbalanced.layer.operators=Unbalanced layer operators.
unbalanced.marked.content.operators=Unbalanced marked content operators.
unbalanced.save.restore.state.operators=Unbalanced save/restore state operators.
unexpected.color.space.in.embedded.icc.profile=Unexpected color space in embedded ICC Profile. It will be ignored.
unexpected.end.of.file=Unexpected end of file.
unexpected.eof=Unexpected EOF
unexpected.gt.gt=Unexpected '>>'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -514,6 +514,7 @@ path.construction.operator.inside.text.object=Pad constructie of drawing operato
unbalanced.layer.operators=Ongebalanceerde operatoren voor layers.
unbalanced.marked.content.operators=Ongebalanceerde marked content operatoren.
unbalanced.save.restore.state.operators=Ongebalanceerde save/restore state operatoren.
unexpected.color.space.in.embedded.icc.profile=Onverwachte kleurenruimte in ingesloten ICC-profiel. Het zal worden genegeerd.
unexpected.end.of.file=Onverwacht einde van het bestand.
unexpected.eof=Onverwachte EOF
unexpected.gt.gt=Onverwachte '>>'
Expand Down
11 changes: 5 additions & 6 deletions itext/src/test/java/com/itextpdf/text/pdf/AcroFieldsTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.w3c.dom.css.RGBColor;

import java.io.*;
import java.util.HashMap;
Expand Down Expand Up @@ -79,7 +78,7 @@ public void testSetFields() throws Exception {
public void testListInSetFields() throws Exception {
singleTest("list_register.xfdf");
}

private void singleTest(String xfdfResourceName) throws Exception {
// merging the FDF file
PdfReader pdfreader = TestResourceUtils.getResourceAsPdfReader(this, "SimpleRegistrationForm.pdf");
Expand All @@ -93,15 +92,15 @@ private void singleTest(String xfdfResourceName) throws Exception {

private final String PDF_COMBO = "./src/test/resources/com/itextpdf/text/pdf/AcroFieldsTest/choice_field_order.pdf";
private final String PDF_COMBO_EXPORT = "./src/test/resources/com/itextpdf/text/pdf/AcroFieldsTest/choice_field_order_export.pdf";

private final String PDF_COMBO_FIELD_NAME = "choice_field";

private final String[] PDF_COMBO_VALUES = {
"Option 1",
"Option 2",
"Option 3"
};

private final String[] PDF_COMBO_EXPORT_VALUES = {
"Export 1",
"Export 2",
Expand Down Expand Up @@ -150,7 +149,7 @@ public void testComboboxExportValues() {
Assert.fail(e.getMessage());
}
}

private void checkOrderOfAppearanceStates(String pdf, String fieldName, String[] expected) throws IOException {
PdfReader reader = new PdfReader(pdf);
AcroFields acroFields = reader.getAcroFields();
Expand Down
135 changes: 135 additions & 0 deletions itext/src/test/java/com/itextpdf/text/pdf/BarcodeMacroPDF417Test.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,135 @@
/*
This file is part of the iText (R) project.
Copyright (c) 1998-2017 iText Group NV
Authors: iText Software.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License version 3
as published by the Free Software Foundation with the addition of the
following permission added to Section 15 as permitted in Section 7(a):
FOR ANY PART OF THE COVERED WORK IN WHICH THE COPYRIGHT IS OWNED BY
ITEXT GROUP. ITEXT GROUP DISCLAIMS THE WARRANTY OF NON INFRINGEMENT
OF THIRD PARTY RIGHTS
This program is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
or FITNESS FOR A PARTICULAR PURPOSE.
See the GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program; if not, see http://www.gnu.org/licenses or write to
the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA, 02110-1301 USA, or download the license from the following URL:
http://itextpdf.com/terms-of-use/
The interactive user interfaces in modified source and object code versions
of this program must display Appropriate Legal Notices, as required under
Section 5 of the GNU Affero General Public License.
In accordance with Section 7(b) of the GNU Affero General Public License,
a covered work must retain the producer line in every PDF that is created
or manipulated using iText.
You can be released from the requirements of the license by purchasing
a commercial license. Buying such a license is mandatory as soon as you
develop commercial activities involving the iText software without
disclosing the source code of your own applications.
These activities include: offering paid services to customers as an ASP,
serving PDFs on the fly in a web application, shipping iText with a closed
source product.
For more information, please contact iText Software Corp. at this
address: sales@itextpdf.com
*/
package com.itextpdf.text.pdf;

import com.itextpdf.testutils.CompareTool;
import com.itextpdf.testutils.ITextTest;
import com.itextpdf.text.BadElementException;
import com.itextpdf.text.BaseColor;
import com.itextpdf.text.Document;
import com.itextpdf.text.Image;
import com.itextpdf.text.Paragraph;
import com.itextpdf.text.Rectangle;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;

import java.io.File;
import java.io.FileOutputStream;

public class BarcodeMacroPDF417Test extends ITextTest {

private static final String CMP_DIR = "./src/test/resources/com/itextpdf/text/pdf/BarcodeMacroPDF417Test/";
private static final String OUT_DIR = "./target/com/itextpdf/test/pdf/BarcodeMacroPDF417Test/";

@Before
public void setUp() {
new File(OUT_DIR).mkdirs();
}

@Override
protected void makePdf(String outPdf) throws Exception {
Document document = new Document();
PdfWriter writer = PdfWriter.getInstance(document, new FileOutputStream(outPdf));
document.open();
PdfContentByte cb = writer.getDirectContent();
Image img = createBarcode(cb, "This is PDF417 segment 0", 1, 1, 0);
document.add(new Paragraph("This is PDF417 segment 0"));
document.add(img);

document.add(new Paragraph("\u00a0"));
document.add(new Paragraph("\u00a0"));
document.add(new Paragraph("\u00a0"));
document.add(new Paragraph("\u00a0"));
document.add(new Paragraph("\u00a0"));
document.add(new Paragraph("\u00a0"));
document.add(new Paragraph("\u00a0"));
document.add(new Paragraph("\u00a0"));

img = createBarcode(cb, "This is PDF417 segment 1", 1, 1, 1);
document.add(new Paragraph("This is PDF417 segment 1"));
document.add(img);
document.close();
}

public Image createBarcode(PdfContentByte cb, String text, float mh, float mw, int segmentId) throws BadElementException {
BarcodePDF417 pf = new BarcodePDF417();

// MacroPDF417 setup
pf.setOptions(BarcodePDF417.PDF417_USE_MACRO);
pf.setMacroFileId("12");
pf.setMacroSegmentCount(2);
pf.setMacroSegmentId(segmentId);

pf.setText(text);
Rectangle size = pf.getBarcodeSize();
PdfTemplate template = cb.createTemplate(mw * size.getWidth(), mh * size.getHeight());
pf.placeBarcode(template, BaseColor.BLACK, mh, mw);
return Image.getInstance(template);
}

@Test
public void test() throws Exception {
runTest();
}

@Override
protected void comparePdf(String outPdf, String cmpPdf) throws Exception {
// compare
CompareTool compareTool = new CompareTool();
String errorMessage = compareTool.compareByContent(outPdf, cmpPdf, OUT_DIR, "diff");
if (errorMessage != null) {
Assert.fail(errorMessage);
}
}

@Override
protected String getOutPdf() {
return OUT_DIR + "barcode_macro_pdf417.pdf";
}

@Override
protected String getCmpPdf() {
return CMP_DIR + "cmp_barcode_macro_pdf417.pdf";
}
}
Loading

0 comments on commit 0d1c72d

Please sign in to comment.