Skip to content

Commit

Permalink
[RELEASE] merging 'release/7.0.2' into 'master'
Browse files Browse the repository at this point in the history
  • Loading branch information
amedee committed Feb 14, 2017
2 parents 957b001 + 0751be7 commit 14deebc
Show file tree
Hide file tree
Showing 1,120 changed files with 26,359 additions and 4,811 deletions.
6 changes: 3 additions & 3 deletions BUILDING.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Running install without a profile will generate the iText 7 jars:
$ mvn clean install \
-Dmaven.test.skip=true \
-Dmaven.javadoc.failOnError=false \
| tee mvn.log
> >(tee mvn.log) 2> >(tee mvn-error.log >&2)
```

To run the tests, [Ghostscript][2] and [Imagemagick][3] must be installed.
Expand All @@ -15,7 +15,7 @@ $ mvn clean install \
-DgsExec=$(which gs) \
-DcompareExec=$(which compare) \
-Dmaven.javadoc.failOnError=false \
| tee mvn.log
> >(tee mvn.log) 2> >(tee mvn-error.log >&2)
```

You can use the supplied `Vagrantfile` to get a [Vagrant][4] VM ([Ubuntu][5] 14.04 LTS - Trusty Tahr, with [VirtualBox][6]) with all the required software installed.
Expand All @@ -24,7 +24,7 @@ $ vagrant box add ubuntu/trusty64
$ vagrant up
$ vagrant ssh -- \
'cd /vagrant ; mvn clean install -Dmaven.test.skip=true -Dmaven.javadoc.failOnError=false' \
| tee mvn.log
> >(tee mvn.log) 2> >(tee mvn-error.log >&2)
```

[1]: http://maven.apache.org/
Expand Down
50 changes: 50 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
[iText][itext] consists of several jars.

The iText 7 Core/Community release contains:
- ```kernel-x.y.z.jar```: low-level functionality
- ```io-x.y.z.jar```: low-level functionality
- ```layout-x.y.z.jar```: high-level functionality
- ```forms-x.y.z.jar```: AcroForms
- ```pdfa-x.y.z.jar```: PDF/A-specific functionality
- ```pdftest-x.y.z.jar```: test helper classes
- ```barcode-x.y.z.jar```: use this if you want to create bar codes
- ```hyph-x.y.z.jar```: use this if you want text to be hyphenated
- ```font-asian-x.y.z.jar```: use this is you need CJK functionality (Chinese / Japanese / Korean)
- ```sign-x.y.z.jar```: use this if you need support for digital signatures

The iText 7 Community source code is hosted on [Github][github], where you can also [download the latest releases][latest].

You can also [build iText 7 Community from source][building].

We also have a tool that can help you debug PDFs:
- ```itext-rups-x.y.z.jar```
RUPS is also hosted on [Github][github-rups]

If you have an idea on how to improve iText and you want to submit code,
please read our [Contribution Guidelines][contributing].

iText is dual licensed as [AGPL][agpl]/Commercial software.

AGPL is a free / open source software license.

This doesn't mean the software is gratis!

Buying a license is mandatory as soon as you develop commercial activities
distributing the iText software inside your product or deploying it on a network
without disclosing the source code of your own applications under the AGPL license.
These activities include:
- offering paid services to customers as an ASP
- serving PDFs on the fly in the cloud or in a web application
- shipping iText with a closed source product

Contact [sales] for more info.

[agpl]: LICENSE.md
[building]: BUILDING.md
[contributing]: CONTRIBUTING.md
[extrajars]: EXTRAJARS.md
[itext]: http://itextpdf.com/
[github]: https://github.com/itext/itext7
[latest]: https://github.com/itext/itext7/releases/latest
[github-rups]: http://github.com/itext/rups
[sales]: http://itextpdf.com/sales
2 changes: 1 addition & 1 deletion barcodes/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.itextpdf</groupId>
<artifactId>root</artifactId>
<version>7.0.1</version>
<version>7.0.2</version>
</parent>

<artifactId>barcodes</artifactId>
Expand Down
21 changes: 8 additions & 13 deletions barcodes/src/main/java/com/itextpdf/barcodes/Barcode128.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
This file is part of the iText (R) project.
Copyright (c) 1998-2016 iText Group NV
Copyright (c) 1998-2017 iText Group NV
Authors: Bruno Lowagie, Paulo Soares, et al.
This program is free software; you can redistribute it and/or modify
Expand Down Expand Up @@ -229,19 +229,14 @@ public class Barcode128 extends Barcode1D {
*/
public Barcode128(PdfDocument document) {
super(document);
try {
x = 0.8f;
font = PdfFontFactory.createFont(FontConstants.HELVETICA, PdfEncodings.WINANSI);
size = 8;
baseline = size;
barHeight = size * 3;
textAlignment = ALIGN_CENTER;
codeType = CODE128;
} catch (IOException e) {
throw new RuntimeException("Cannot create font", e);
}
x = 0.8f;
font = document.getDefaultFont();
size = 8;
baseline = size;
barHeight = size * 3;
textAlignment = ALIGN_CENTER;
codeType = CODE128;
}

public enum Barcode128CodeSet {
A,
B,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
This file is part of the iText (R) project.
Copyright (c) 1998-2016 iText Group NV
Copyright (c) 1998-2017 iText Group NV
Authors: Bruno Lowagie, Paulo Soares, et al.
This program is free software; you can redistribute it and/or modify
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
This file is part of the iText (R) project.
Copyright (c) 1998-2016 iText Group NV
Copyright (c) 1998-2017 iText Group NV
Authors: Bruno Lowagie, Paulo Soares, et al.
This program is free software; you can redistribute it and/or modify
Expand Down
26 changes: 11 additions & 15 deletions barcodes/src/main/java/com/itextpdf/barcodes/Barcode39.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
This file is part of the iText (R) project.
Copyright (c) 1998-2016 iText Group NV
Copyright (c) 1998-2017 iText Group NV
Authors: Bruno Lowagie, Paulo Soares, et al.
This program is free software; you can redistribute it and/or modify
Expand Down Expand Up @@ -133,20 +133,16 @@ public class Barcode39 extends Barcode1D {
*/
public Barcode39(PdfDocument document) {
super(document);
try {
x = 0.8f;
n = 2;
font = PdfFontFactory.createFont(FontConstants.HELVETICA, PdfEncodings.WINANSI);
size = 8;
baseline = size;
barHeight = size * 3;
generateChecksum = false;
checksumText = false;
startStopText = true;
extended = false;
} catch (IOException e) {
throw new PdfException(e);
}
x = 0.8f;
n = 2;
font = document.getDefaultFont();
size = 8;
baseline = size;
barHeight = size * 3;
generateChecksum = false;
checksumText = false;
startStopText = true;
extended = false;
}

/**
Expand Down
26 changes: 11 additions & 15 deletions barcodes/src/main/java/com/itextpdf/barcodes/BarcodeCodabar.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
This file is part of the iText (R) project.
Copyright (c) 1998-2016 iText Group NV
Copyright (c) 1998-2017 iText Group NV
Authors: Bruno Lowagie, Paulo Soares, et al.
This program is free software; you can redistribute it and/or modify
Expand Down Expand Up @@ -93,20 +93,16 @@ public class BarcodeCodabar extends Barcode1D {
*/
public BarcodeCodabar(PdfDocument document) {
super(document);
try {
x = 0.8f;
n = 2;
font = PdfFontFactory.createFont(FontConstants.HELVETICA, PdfEncodings.WINANSI);
size = 8;
baseline = size;
barHeight = size * 3;
textAlignment = ALIGN_CENTER;
generateChecksum = false;
checksumText = false;
startStopText = false;
} catch (Exception e) {
throw new PdfException(e.getMessage(), e.getCause());
}
x = 0.8f;
n = 2;
font = document.getDefaultFont();
size = 8;
baseline = size;
barHeight = size * 3;
textAlignment = ALIGN_CENTER;
generateChecksum = false;
checksumText = false;
startStopText = false;
}

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
This file is part of the iText (R) project.
Copyright (c) 1998-2016 iText Group NV
Copyright (c) 1998-2017 iText Group NV
Authors: Bruno Lowagie, Paulo Soares, et al.
This program is free software; you can redistribute it and/or modify
Expand Down
22 changes: 9 additions & 13 deletions barcodes/src/main/java/com/itextpdf/barcodes/BarcodeEAN.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
This file is part of the iText (R) project.
Copyright (c) 1998-2016 iText Group NV
Copyright (c) 1998-2017 iText Group NV
Authors: Bruno Lowagie, Paulo Soares, et al.
This program is free software; you can redistribute it and/or modify
Expand Down Expand Up @@ -211,18 +211,14 @@ public class BarcodeEAN extends Barcode1D {
*/
public BarcodeEAN(PdfDocument document) {
super(document);
try {
x = 0.8f;
font = PdfFontFactory.createFont(FontConstants.HELVETICA, PdfEncodings.WINANSI);
size = 8;
baseline = size;
barHeight = size * 3;
guardBars = true;
codeType = EAN13;
code = "";
} catch (IOException e) {
throw new PdfException(e);
}
x = 0.8f;
font = document.getDefaultFont();
size = 8;
baseline = size;
barHeight = size * 3;
guardBars = true;
codeType = EAN13;
code = "";
}

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
This file is part of the iText (R) project.
Copyright (c) 1998-2016 iText Group NV
Copyright (c) 1998-2017 iText Group NV
Authors: Bruno Lowagie, Paulo Soares, et al.
This program is free software; you can redistribute it and/or modify
Expand Down
24 changes: 10 additions & 14 deletions barcodes/src/main/java/com/itextpdf/barcodes/BarcodeInter25.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
This file is part of the iText (R) project.
Copyright (c) 1998-2016 iText Group NV
Copyright (c) 1998-2017 iText Group NV
Authors: Bruno Lowagie, Paulo Soares, et al.
This program is free software; you can redistribute it and/or modify
Expand Down Expand Up @@ -97,19 +97,15 @@ public class BarcodeInter25 extends Barcode1D {
*/
public BarcodeInter25(PdfDocument document) {
super(document);
try {
x = 0.8f;
n = 2;
font = PdfFontFactory.createFont(FontConstants.HELVETICA, PdfEncodings.WINANSI);
size = 8;
baseline = size;
barHeight = size * 3;
textAlignment = ALIGN_CENTER;
generateChecksum = false;
checksumText = false;
} catch (Exception e) {
throw new PdfException(e);
}
x = 0.8f;
n = 2;
font = document.getDefaultFont();
size = 8;
baseline = size;
barHeight = size * 3;
textAlignment = ALIGN_CENTER;
generateChecksum = false;
checksumText = false;
}

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
This file is part of the iText (R) project.
Copyright (c) 1998-2016 iText Group NV
Copyright (c) 1998-2017 iText Group NV
Authors: Bruno Lowagie, Paulo Soares, et al.
This program is free software; you can redistribute it and/or modify
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
This file is part of the iText (R) project.
Copyright (c) 1998-2016 iText Group NV
Copyright (c) 1998-2017 iText Group NV
Authors: Bruno Lowagie, Paulo Soares, et al.
This program is free software; you can redistribute it and/or modify
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
This file is part of the iText (R) project.
Copyright (c) 1998-2016 iText Group NV
Copyright (c) 1998-2017 iText Group NV
Authors: Bruno Lowagie, Paulo Soares, et al.
This program is free software; you can redistribute it and/or modify
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
This file is part of the iText (R) project.
Copyright (c) 1998-2016 iText Group NV
Copyright (c) 1998-2017 iText Group NV
Authors: Bruno Lowagie, Paulo Soares, et al.
This program is free software; you can redistribute it and/or modify
Expand Down Expand Up @@ -44,6 +44,16 @@ This file is part of the iText (R) project.
package com.itextpdf.barcodes.dmcode;

public class DmParams {
/**
* Creates a DM code parameter block
* @param height total height
* @param width total width
* @param heightSection height of a single section
* @param widthSection width of a single section
* @param dataSize size of the data
* @param dataBlock size of a data-block
* @param errorBlock size of a error-correction block
*/
public DmParams(int height, int width, int heightSection, int widthSection, int dataSize, int dataBlock, int errorBlock) {
this.height = height;
this.width = width;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
This file is part of the iText (R) project.
Copyright (c) 1998-2016 iText Group NV
Copyright (c) 1998-2017 iText Group NV
Authors: Bruno Lowagie, Paulo Soares, et al.
This program is free software; you can redistribute it and/or modify
Expand Down Expand Up @@ -56,6 +56,13 @@ public class Placement {
private Placement() {
}


/**
* Execute the placement
* @param nrow number of rows
* @param ncol number of columns
* @return array containing appropriate values for ECC200
*/
public static short[] doPlacement(int nrow, int ncol) {
int key = nrow * 1000 + ncol;
short[] pc = cache.get(key);
Expand Down
Loading

0 comments on commit 14deebc

Please sign in to comment.