Merge branch 'release/5.5.12'

BUILDING.md

@@ -1,18 +1 @@
-To build iText, Maven must be installed: http://maven.apache.org/
-
-Running install without a profile will generate the itextpdf jar:
-
-```mvn install```
-
-When using the profile 'all' also the source and javadoc jars will be generated:
-
-```mvn install -P all```
-
-If you are in need of the asian font jars, you can run one of the following commands:
-
-```mvn clean install -f itext-asian.pom```    
-```mvn clean install -f itext-asiancmaps.pom```
-
-If you need the hyphenation jar, execute:
-
-```mvn clean install -f itext-hyph-xml.pom```
+To build **iText 5 .NET** (aka iTextSharp), you need to build `src/BuildAll.sln`.

README.md

@@ -24,7 +24,7 @@ iText is licensed as [AGPL][agpl] software.
 
 AGPL is a free / open source software license.
 
-This doesn't mean the software is gratis!
+This doesn't mean the software is [gratis][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
@@ -39,3 +39,4 @@ Contact sales for more info: http://itextpdf.com/sales
 [agpl]: LICENSE.md
 [building]: BUILDING.md
 [contributing]: CONTRIBUTING.md
+[gratis]: https://en.wikipedia.org/wiki/Gratis_versus_libre

src/core/AssemblyInfo.cs

@@ -16,4 +16,4 @@
 
 [assembly: ComVisibleAttribute(false)]
 
-[assembly: AssemblyVersion("5.5.11")]
+[assembly: AssemblyVersion("5.5.12")]

src/core/iTextSharp/text/Version.cs

@@ -72,7 +72,7 @@ public sealed class Version {
 	     * This String contains the version number of this iText release.
 	     * For debugging purposes, we request you NOT to change this constant.
 	     */
-        static private String release = "5.5.11";
+        static private String release = "5.5.12";
 
 	    /**
 	     * This String contains the iText version as shown in the producer line.

src/core/iTextSharp/text/error_messages/en.lng

@@ -74,6 +74,7 @@ an.uncolored.pattern.was.expected=An uncolored pattern was expected.
 an.uncolored.tile.pattern.can.not.have.another.pattern.or.shading.as.color=An uncolored tile pattern can not have another pattern or shading as color.
 annotation.of.type.1.should.have.contents.key=Annotation of type {1} should have Contents key.
 annotation.type.1.not.allowed=Annotation type {1} not allowed.
+annotation.type.not.supported.flattening=This annotation is not supported for flattening. Skipping this annotation.
 appearance.dictionary.of.widget.subtype.and.btn.field.type.shall.contain.only.the.n.key.with.dictionary.value=Appearance dictionary of Widget subtype and Btn field type shall contain only the n key with dictionary value
 appearance.dictionary.shall.contain.only.the.n.key.with.stream.value=Appearance dictionary shall contain only the N key with stream value.
 append.mode.does.not.support.changing.the.encryption.status=Append mode does not support changing the encryption status.
@@ -167,6 +168,7 @@ error.in.base64.code.reading.stream=Error in Base64 code reading stream.
 error.parsing.cmap.beginbfchar.expected.cosstring.or.cosname.and.not.1=Error parsing CMap beginbfchar, expected {COSString or COSName} and not {1}
 error.reading.objstm=Error reading ObjStm
 error.reading.string=Error reading string
+error.resolving.freetext.font=Cannot resolve annotation's font. It won't be flattened
 error.with.jp.marker=Error with JP Marker
 every.annotation.shall.have.at.least.one.appearance.dictionary=Every annotation shall have at least one appearance dictionary
 exactly.one.colour.space.specification.shall.have.the.value.0x01.in.the.approx.field=Exactly one colour space specification shall have the value 0x01 in the APPROX field.
@@ -194,6 +196,7 @@ font.1.with.2.is.not.recognized=Font '{1}' with '{2}' is not recognized.
 font.and.size.must.be.set.before.writing.any.text=Font and size must be set before writing any text
 font.size.too.small.1=Font size too small: {1}
 fontfactoryimp.cannot.be.null=FontFactoryImp cannot be null.
+freetext.annotation.doesnt.contain.da=FreeText Annotation doesn't contain a DA. Not flattening this annotation.
 freetext.flattening.is.not.supported.in.append.mode=FreeText flattening is not supported in append mode.
 annotation.flattening.is.not.supported.in.append.mode=Annotation flattening is not supported in append mode.
 getcell.at.illegal.index.1.max.is.2=getCell at illegal index :{1} max is {2}
@@ -272,6 +275,7 @@ it.is.not.possible.to.free.reader.in.merge.fields.mode=It is not possible to fre
 java.awt.image.fetch.aborted.or.errored=java.awt.Image fetch aborted or errored
 java.awt.image.interrupted.waiting.for.pixels=java.awt.Image Interrupted waiting for pixels!
 jpeg2000.enumerated.colour.space.19.(CIEJab).shall.not.be.used=JPEG2000 enumerated colour space 19 (CIEJab) shall not be used.
+key.is.null=key is null.
 keyword.encrypt.shall.not.be.used.in.the.trailer.dictionary=Keyword Encrypt shall not be used in the trailer dictionary.
 lab.cs.black.point=The BlackPoint entry in Lab color space could be only an array of three numbers [XB YB ZB]. All three of these numbers shall be non-negative. Default value: [0.0 0.0 0.0].
 lab.cs.range=The Range entry in Lab color space could be only an array of four numbers [amin amax bmin bmax]. Default value: [-100 100 -100 100].
@@ -392,6 +396,7 @@ stdcf.not.found.encryption=/StdCF not found (encryption)
 stream.could.not.be.compressed.filter.is.not.a.name.or.array=Stream could not be compressed: filter is not a name or array.
 stream.object.dictionary.shall.not.contain.the.f.ffilter.or.fdecodeparams.keys=Stream object dictionary shall not contain the F, FFilter or FDecodeParams keys.
 structparent.not.found=StructParent not found.
+structparentid.not.found=StructParent ID not found.
 support.only.sha1.hash.algorithm=Support only SHA1 hash algorithm.
 support.only.rsa.and.dsa.algorithms=Support only RSA and DSA algorithms.
 invalid.structparent=Invalid StructParent.

src/core/iTextSharp/text/error_messages/nl.lng

@@ -74,6 +74,7 @@ an.uncolored.pattern.was.expected=Er werd een ongekleurd patroon verwacht.
 an.uncolored.tile.pattern.can.not.have.another.pattern.or.shading.as.color=Een ongekleurd tile pattern kan geen ander pattern of shading als color gebruiken.
 annotation.of.type.1.should.have.contents.key=Annotation van type {1} moet een Contents sleutel hebben.
 annotation.type.1.not.allowed=Annotation type {1} niet toegelaten.
+annotation.type.not.supported.flattening=Dit annotatie type is niet ondersteund tijdens het flattenen. Deze wordt overgeslaan.
 appearance.dictionary.of.widget.subtype.and.btn.field.type.shall.contain.only.the.n.key.with.dictionary.value=Appearance dictionary van subtype Widget en field type Btn mag enkel de N sleutel met als waarde een Dictionaty bevatten
 appearance.dictionary.shall.contain.only.the.n.key.with.stream.value=Appearance dictionary mag enkel de N sleutel met een stream waarde bevatten.
 append.mode.does.not.support.changing.the.encryption.status=Append mode laat geen wijziging toe van de encryptie status.
@@ -167,6 +168,7 @@ error.in.base64.code.reading.stream=Fout in de Base64 code reading stream.
 error.parsing.cmap.beginbfchar.expected.cosstring.or.cosname.and.not.1=Fout bij het parsen van CMap beginbfchar, {COSString or COSName} verwacht in plaats van {1}
 error.reading.objstm=Fout tijdens het lezen van ObjStm
 error.reading.string=Fout bij het lezen van een string
+error.resolving.freetext.font=Kan het lettertype van annotatie niet oplossen. Het wordt niet afgedrukt
 error.with.jp.marker=Foute JP Marker
 every.annotation.shall.have.at.least.one.appearance.dictionary=Elke annotation moet ten minste 1 appearance dictionary hebben
 exactly.one.colour.space.specification.shall.have.the.value.0x01.in.the.approx.field=Exact 1 colour space specificatie moet de waarde 0x01 in het APPROX veld hebben.
@@ -194,6 +196,7 @@ font.1.with.2.is.not.recognized=Font '{1}' met '{2}' werd niet herkend.
 font.and.size.must.be.set.before.writing.any.text=Font en size moeten bepaald zijn vooraleer je tekst schrijft.
 font.size.too.small.1=Font size te klein: {1}
 fontfactoryimp.cannot.be.null=FontFactoryImp kan niet null zijn.
+freetext.annotation.doesnt.contain.da=FreeText Annotatie bevat geen DA. Deze annotatie kan niet worden geflattened en wordt overgeslaan.
 freetext.flattening.is.not.supported.in.append.mode=FreeText flattening is niet ondersteund in append mode.
 annotation.flattening.is.not.supported.in.append.mode=Het flattenen van annotations is niet ondersteund in append mode.
 getcell.at.illegal.index.1.max.is.2=getCell op ongeldige index:{1} maximum: {2}
@@ -272,6 +275,7 @@ it.is.not.possible.to.free.reader.in.merge.fields.mode=freeReader is niet mogeli
 java.awt.image.fetch.aborted.or.errored=Ophalen van java.awt.Image afgebroken of misgelopen.
 java.awt.image.interrupted.waiting.for.pixels=java.awt.Image onderbroken; aan het wachten op pixels!
 jpeg2000.enumerated.colour.space.19.(CIEJab).shall.not.be.used=JPEG2000 enumerated colour space 19 (CIEJab) mag niet gebruikt worden.
+key.is.null=sleutel is nul.
 keyword.encrypt.shall.not.be.used.in.the.trailer.dictionary=Keyword Encrypt mag niet gebruikt worden in de trailer dictionary.
 lab.cs.black.point=De BlackPoint entry in Lab color space mag enkel een array zijn van drie getallen [XB YB ZB]. Al deze getallen moeten niet-negatief zijn. Standaardwaarde: [0.0 0.0 0.0].
 lab.cs.range=De Range entry in Lab color space mag enkel een array zijn van vier getallen [amin amax bmin bmax]. Standaardwaarde: [-100 100 -100 100].
@@ -392,6 +396,7 @@ stdcf.not.found.encryption=/StdCF niet gevonden (encryption)
 stream.could.not.be.compressed.filter.is.not.a.name.or.array=Stream kon niet gecomprimeerd worden: de filter is geen naam of array.
 stream.object.dictionary.shall.not.contain.the.f.ffilter.or.fdecodeparams.keys=Stream object dictionary mag geen F, FFilter of FDecodeParams sleutels bevatten.
 structparent.not.found=StructParent niet gevonden.
+structparentid.not.found=StructParent ID niet gevonden.
 support.only.sha1.hash.algorithm=Enkel ondersteuning voor SHA1 hash algoritme.
 support.only.rsa.and.dsa.algorithms=Enkel ondersteuning voor RSA en DSA algoritmes.
 invalid.structparent=Ongeldige StructParent.

src/core/iTextSharp/text/pdf/AcroFields.cs

@@ -1760,7 +1760,7 @@ virtual public bool RemoveField(String name, int page) {
                 PdfIndirectReference kid = refi;
                 while ((refi = wd.GetAsIndirectObject(PdfName.PARENT)) != null) {
                     wd = wd.GetAsDict( PdfName.PARENT );
-                    //if (wd == null) break; //avoid null-reference exceptions in case of removing fields with kids (see SUP-1846)
+                    if (wd == null) break; //avoid null-reference exceptions in case of removing fields with kids (see SUP-1846)
                     PdfArray kids = wd.GetAsArray(PdfName.KIDS);
                     if (RemoveRefFromArray(kids, kid) != 0)
                         break;