Merge branch 'release/7.0.0-RC.20160321'

Author: amedee

.gitignore

@@ -151,6 +151,6 @@ nbactions*.xml
 .pmdruleset.xml
 
 # Ignore generated files
-samples/src/test/resources/db/filmfestival.log
+filmfestival.log
 
 .vagrant/

BUILDING.md

@@ -0,0 +1,25 @@
+To build iText 7, [Maven][1] must be installed.
+
+Running install without a profile will generate the iText 7 jars:
+```bash
+$ mvn clean install -Dmaven.test.skip=true | tee mvn.log
+```
+
+To run the tests, [Ghostscript][2] and [Imagemagick][3] must be installed.
+```bash
+$ mvn clean install -Dmaven.test.failure.ignore=false -DgsExec=$(which gs) -DcompareExec=$(which compare) | tee mvn.log
+```
+
+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.
+```bash
+$ vagrant box add ubuntu/trusty64
+$ vagrant up
+$ vagrant ssh -- 'cd /vagrant ; mvn clean install -Dmaven.test.skip=true' | tee mvn.log
+```
+
+[1]: http://maven.apache.org/
+[2]: http://www.ghostscript.com/
+[3]: http://www.imagemagick.org/
+[4]: https://www.vagrantup.com/
+[5]: http://www.ubuntu.com/
+[6]: https://www.virtualbox.org/

barcodes/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.itextpdf</groupId>
         <artifactId>root</artifactId>
-        <version>7.0.0-RC.20160201</version>
+        <version>7.0.0-RC.20160321</version>
     </parent>
 
     <artifactId>barcodes</artifactId>

barcodes/src/main/java/com/itextpdf/barcodes/BarcodeDataMatrix.java

@@ -75,6 +75,10 @@ public class BarcodeDataMatrix extends Barcode2D {
      */
     public static final int DM_TEST = 64;
 
+    public static final String DEFAULT_DATA_MATRIX_ENCODING = "iso-8859-1";
+
+    private String encoding;
+
     private final static DmParams[] dmSizes = {
             new DmParams(10, 10, 10, 10, 3, 3, 5),
             new DmParams(12, 12, 12, 12, 5, 5, 7),
@@ -120,6 +124,17 @@ public class BarcodeDataMatrix extends Barcode2D {
      * Creates an instance of this class.
      */
     public BarcodeDataMatrix() {
+        encoding = DEFAULT_DATA_MATRIX_ENCODING;
+    }
+
+    public BarcodeDataMatrix(String code) {
+        encoding = DEFAULT_DATA_MATRIX_ENCODING;
+        setCode(code);
+    }
+
+    public BarcodeDataMatrix(String code, String encoding) {
+        this.encoding = encoding;
+        setCode(code);
     }
 
     @Override
@@ -140,8 +155,8 @@ public PdfFormXObject createFormXObject(Color foreground, PdfDocument document)
     /**
      * Creates a PdfFormXObject with the barcode with given module width and module height.
      *
-     * @param foreground   the color of the pixels. It can be <CODE>null</CODE>
-     * @param moduleSide  the side (width and height) of the pixels.
+     * @param foreground the color of the pixels. It can be <CODE>null</CODE>
+     * @param moduleSide the side (width and height) of the pixels.
      * @return the XObject.
      */
     public PdfFormXObject createFormXObject(Color foreground, float moduleSide, PdfDocument document) {
@@ -236,7 +251,7 @@ public Rectangle getBarcodeSize(float moduleHeight, float moduleWidth) {
     public int setCode(String text) {
         byte[] t;
         try {
-            t = text.getBytes("iso-8859-1");
+            t = text.getBytes(encoding);
         } catch (UnsupportedEncodingException exc) {
             throw new IllegalArgumentException("text has to be encoded in iso-8859-1");
         }
@@ -436,6 +451,8 @@ public int getOptions() {
         return options;
     }
 
+
+
     /**
      * Sets the options for the barcode generation. The options can be:<p>
      * One of:<br>
@@ -468,6 +485,19 @@ public void setOptions(int options) {
         this.options = options;
     }
 
+    /**
+     * setting encoding for data matrix code ( default  encoding iso-8859-1)
+     * @param encoding encoding for data matrix code
+     */
+    public void setEncoding(String encoding) {
+        this.encoding = encoding;
+    }
+
+    public String getEncoding() {
+        return encoding;
+    }
+
+
 
     private static void makePadding(byte[] data, int position, int count) {
         //already in ascii mode

barcodes/src/test/java/com/itextpdf/barcodes/BarcodeDataMatrixTest.java

@@ -1,6 +1,7 @@
 package com.itextpdf.barcodes;
 
 
+import com.itextpdf.barcodes.qrcode.EncodeHintType;
 import com.itextpdf.kernel.PdfException;
 import com.itextpdf.kernel.pdf.canvas.PdfCanvas;
 import com.itextpdf.kernel.color.Color;
@@ -13,6 +14,8 @@
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
 
 import com.itextpdf.test.annotations.type.IntegrationTest;
 import org.junit.Assert;
@@ -51,4 +54,23 @@ public void barcode01Test() throws IOException, PdfException, InterruptedExcepti
         Assert.assertNull(new CompareTool().compareByContent(destinationFolder + filename, sourceFolder + "cmp_" + filename, destinationFolder, "diff_"));
     }
 
+    @Test
+    public void barcode02Test() throws IOException, PdfException, InterruptedException {
+        String filename = "barcodeDataMatrix2.pdf";
+        PdfWriter writer = new PdfWriter(new FileOutputStream( destinationFolder +filename));
+        PdfDocument document = new PdfDocument(writer);
+
+
+
+        PdfPage page1 = document.addNewPage();
+        PdfCanvas canvas = new PdfCanvas(page1);
+        BarcodeDataMatrix barcode2 = new BarcodeDataMatrix("дима","UTF-8");
+        barcode2.placeBarcode(canvas, Color.GREEN, 10);
+        document.close();
+
+        Assert.assertNull(new CompareTool().compareByContent(destinationFolder + filename, sourceFolder + "cmp_" + filename, destinationFolder, "diff_"));
+
+
+    }
+
 }

barcodes/src/test/java/com/itextpdf/barcodes/BarcodeQRCodeTest.java

@@ -14,6 +14,7 @@
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.nio.charset.Charset;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -33,7 +34,7 @@ public class BarcodeQRCodeTest {
     static public void beforeClass() {
         File dir = new File(destinationFolder);
         dir.mkdirs();
-        for(File file: dir.listFiles())
+        for (File file : dir.listFiles())
             file.delete();
     }
 
@@ -55,4 +56,24 @@ public void barcode01Test() throws IOException, PdfException, InterruptedExcepti
         Assert.assertNull(new CompareTool().compareByContent(destinationFolder + filename, sourceFolder + "cmp_" + filename, destinationFolder, "diff_"));
     }
 
+    @Test
+    public void barcode02Test() throws IOException, PdfException, InterruptedException {
+        String filename ="barcodeQRCode02.pdf";
+        PdfWriter writer = new PdfWriter(new FileOutputStream( destinationFolder + filename));
+        PdfDocument document = new PdfDocument(writer);
+
+        PdfPage page1 = document.addNewPage();
+        PdfCanvas canvas = new PdfCanvas(page1);
+        Map<EncodeHintType, Object> hints = new HashMap<>();
+        hints.put(EncodeHintType.CHARACTER_SET, "UTF-8");
+        BarcodeQRCode barcode1 = new BarcodeQRCode("дима", hints);
+        barcode1.placeBarcode(canvas, Color.GRAY, 12);
+
+        document.close();
+
+        Assert.assertNull(new CompareTool().compareByContent(destinationFolder + filename, sourceFolder + "cmp_" + filename, destinationFolder, "diff_"));
+
+
+    }
+
 }

barcodes/src/test/resources/com/itextpdf/barcodes/cmp_barcodeDataMatrix2.pdf

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.itextpdf</groupId>
         <artifactId>root</artifactId>
-        <version>7.0.0-RC.20160201</version>
+        <version>7.0.0-RC.20160321</version>
     </parent>
 
     <artifactId>forms</artifactId>