diff options
| author | Jeremias Maerki <jeremias@apache.org> | 2008-12-09 15:00:35 +0000 |
|---|---|---|
| committer | Jeremias Maerki <jeremias@apache.org> | 2008-12-09 15:00:35 +0000 |
| commit | a6ddced309701a1ca8d79a9e7bec3288afba2cc8 (patch) | |
| tree | c3d2bcfe7277246d9a2acc3675721a99f4de5727 /src/java/org/apache/fop/render/pdf/PDFRendererConfigurator.java | |
| parent | 9d339f0968314f0cfcc4a720628fed1845292ce1 (diff) | |
| parent | f9d4720b99f5e0fb423b097d7207dfab446d911c (diff) | |
| download | xmlgraphics-fop-a6ddced309701a1ca8d79a9e7bec3288afba2cc8.tar.gz xmlgraphics-fop-a6ddced309701a1ca8d79a9e7bec3288afba2cc8.zip | |
Merge from Trunk revisions 719662 - 724689.
Conflict for ImageHandler interface resolved by renaming Trunk's ImageHandler to ImageHandlerBase and extending the other ImageHandler from that.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign@724729 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/java/org/apache/fop/render/pdf/PDFRendererConfigurator.java')
| -rw-r--r-- | src/java/org/apache/fop/render/pdf/PDFRendererConfigurator.java | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/java/org/apache/fop/render/pdf/PDFRendererConfigurator.java b/src/java/org/apache/fop/render/pdf/PDFRendererConfigurator.java index d416f1147..fccba1c25 100644 --- a/src/java/org/apache/fop/render/pdf/PDFRendererConfigurator.java +++ b/src/java/org/apache/fop/render/pdf/PDFRendererConfigurator.java @@ -54,6 +54,7 @@ public class PDFRendererConfigurator extends PrintRendererConfigurator /** * Default constructor + * * @param userAgent user agent */ public PDFRendererConfigurator(FOUserAgent userAgent) { @@ -64,6 +65,7 @@ public class PDFRendererConfigurator extends PrintRendererConfigurator * Configure the PDF renderer. * Get the configuration to be used for pdf stream filters, * fonts etc. + * * @param renderer pdf renderer * @throws FOPException fop exception */ @@ -97,7 +99,8 @@ public class PDFRendererConfigurator extends PrintRendererConfigurator if (s != null) { pdfUtil.setXMode(PDFXMode.valueOf(s)); } - Configuration encryptionParamsConfig = cfg.getChild(PDFRenderer.ENCRYPTION_PARAMS, false); + Configuration encryptionParamsConfig + = cfg.getChild(PDFRenderer.ENCRYPTION_PARAMS, false); if (encryptionParamsConfig != null) { PDFEncryptionParams encryptionParams = new PDFEncryptionParams(); Configuration ownerPasswordConfig = encryptionParamsConfig.getChild( @@ -142,8 +145,8 @@ public class PDFRendererConfigurator extends PrintRendererConfigurator if (s != null) { pdfUtil.setOutputProfileURI(s); } - Configuration disableColorSpaceConfig - = cfg.getChild(PDFRenderer.KEY_DISABLE_SRGB_COLORSPACE, false); + Configuration disableColorSpaceConfig = cfg.getChild( + PDFRenderer.KEY_DISABLE_SRGB_COLORSPACE, false); if (disableColorSpaceConfig != null) { pdfUtil.setDisableSRGBColorSpace( disableColorSpaceConfig.getValueAsBoolean(false)); @@ -152,6 +155,7 @@ public class PDFRendererConfigurator extends PrintRendererConfigurator /** * Builds a filter map from an Avalon Configuration object. + * * @param cfg the Configuration object * @return Map the newly built filter map * @throws ConfigurationException if a filter list is defined twice |