From 07f112a532b277e6ebada50f8654b3aacb8e9a47 Mon Sep 17 00:00:00 2001 From: Simon Steiner Date: Thu, 21 Aug 2014 14:42:22 +0000 Subject: [PATCH] FOP-2353: PDF-A preflight warnings git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1619415 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/fop/render/pdf/PDFRenderingUtil.java | 8 +++++++- .../fop/render/pdf/PDFStructureTreeBuilder.java | 16 ++++++++++++++-- 3 files changed, 21 insertions(+), 3 deletions(-) Index: fop-1.1/src/java/org/apache/fop/render/pdf/PDFRenderingUtil.java =================================================================== --- fop-1.1.orig/src/java/org/apache/fop/render/pdf/PDFRenderingUtil.java +++ fop-1.1/src/java/org/apache/fop/render/pdf/PDFRenderingUtil.java @@ -25,6 +25,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.net.URL; +import java.util.ArrayList; import java.util.Map; import javax.xml.transform.Source; @@ -37,6 +38,7 @@ import org.apache.commons.logging.LogFac import org.apache.xmlgraphics.image.loader.util.ImageUtil; import org.apache.xmlgraphics.java2d.color.profile.ColorProfileUtil; import org.apache.xmlgraphics.xmp.Metadata; +import org.apache.xmlgraphics.xmp.schemas.DublinCoreSchema; import org.apache.xmlgraphics.xmp.schemas.XMPBasicAdapter; import org.apache.xmlgraphics.xmp.schemas.XMPBasicSchema; @@ -352,8 +354,8 @@ class PDFRenderingUtil implements PDFCon public void renderXMPMetadata(XMPMetadata metadata) { Metadata docXMP = metadata.getMetadata(); Metadata fopXMP = PDFMetadata.createXMPFromPDFDocument(pdfDoc); - //Merge FOP's own metadata into the one from the XSL-FO document - fopXMP.mergeInto(docXMP); + ArrayList exclude = new ArrayList(); + fopXMP.mergeInto(docXMP, exclude); XMPBasicAdapter xmpBasic = XMPBasicSchema.getAdapter(docXMP); //Metadata was changed so update metadata date xmpBasic.setMetadataDate(new java.util.Date());