You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by ac...@apache.org on 2008/04/04 14:57:50 UTC
svn commit: r644700 - in /xmlgraphics/fop/branches/Temp_AFPGOCAResources: ./
src/java/org/apache/fop/svg/PDFGraphics2D.java status.xml
Author: acumiskey
Date: Fri Apr 4 05:57:47 2008
New Revision: 644700
URL: http://svn.apache.org/viewvc?rev=644700&view=rev
Log:
Merged revisions 644691,644697 via svnmerge from
https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk
........
r644691 | jeremias | 2008-04-04 13:19:50 +0100 (Fri, 04 Apr 2008) | 3 lines
Bugzilla #44743:
Added a public accessor for reference to the current page to PDFGraphics2D.
Submitted by: Yegor Kozlov <yegor.at.dinom.ru>
........
r644697 | jeremias | 2008-04-04 13:40:22 +0100 (Fri, 04 Apr 2008) | 2 lines
Bugzilla #44744:
Disable drawString(AttributedCharacterIterator, float, float) as it contains bugs and rely on the fallback implementation from AbstractGraphics2D.
........
Modified:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/ (props changed)
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/svg/PDFGraphics2D.java
xmlgraphics/fop/branches/Temp_AFPGOCAResources/status.xml
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Apr 4 05:57:47 2008
@@ -1 +1 @@
-/xmlgraphics/fop/trunk:1-644238
+/xmlgraphics/fop/trunk:1-644699
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/svg/PDFGraphics2D.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/svg/PDFGraphics2D.java?rev=644700&r1=644699&r2=644700&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/svg/PDFGraphics2D.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/svg/PDFGraphics2D.java Fri Apr 4 05:57:47 2008
@@ -50,8 +50,6 @@
import java.io.IOException;
import java.io.OutputStream;
import java.io.StringWriter;
-import java.text.AttributedCharacterIterator;
-import java.text.CharacterIterator;
import java.util.List;
import java.util.Map;
@@ -304,7 +302,15 @@
}
/**
- * Set the Grpahics context.
+ * Gets the PDF reference of the current page.
+ * @return the PDF reference of the current page
+ */
+ public String getPageReference() {
+ return this.pageRef;
+ }
+
+ /**
+ * Set the Graphics context.
* @param c the graphics context to use
*/
public void setGraphicContext(GraphicContext c) {
@@ -390,7 +396,7 @@
if (linkType != PDFLink.EXTERNAL) {
String pdfdest = "/FitR " + dest;
resourceContext.addAnnotation(
- pdfDoc.getFactory().makeLink(rect, pageRef, pdfdest));
+ pdfDoc.getFactory().makeLink(rect, getPageReference(), pdfdest));
} else {
resourceContext.addAnnotation(
pdfDoc.getFactory().makeLink(rect, dest, linkType, 0));
@@ -958,7 +964,7 @@
PDFResources res = pdfDoc.getFactory().makeResources();
PDFResourceContext context = new PDFResourceContext(res);
PDFGraphics2D pattGraphic = new PDFGraphics2D(textAsShapes, specialFontInfo,
- pdfDoc, context, pageRef,
+ pdfDoc, context, getPageReference(),
"", 0);
pattGraphic.setGraphicContext(new GraphicContext());
pattGraphic.gc.validateTransformStack();
@@ -1512,7 +1518,7 @@
* @see #setTransform
* @see #setComposite
* @see #setClip
- */
+ *//* TODO Reimplement for higher efficiency similar to the way it was done in PDFTextPainter
public void drawString(AttributedCharacterIterator iterator, float x,
float y) {
preparePainting();
@@ -1577,7 +1583,7 @@
}
currentStream.write("ET\n");
- }
+ }*/
/**
* Fills the interior of a <code>Shape</code> using the settings of the
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/status.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/status.xml?rev=644700&r1=644699&r2=644700&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/status.xml (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/status.xml Fri Apr 4 05:57:47 2008
@@ -59,6 +59,9 @@
<action context="Renderers" dev="AC" importance="high" type="add">
Added de-duplication and externalization support for IOCA and GOCA data resource objects.
</action>
+ <action context="Renderers" dev="JM" type="add" fixes-bug="44743" due-to="Yegor Kozlov">
+ Added a public accessor for reference to the current page to PDFGraphics2D.
+ </action>
<action context="Fonts" dev="JM" type="add" fixes-bug="44737" due-to="Jason Harrop">
Added support for auto-configuring TrueType Collections. XML font metrics files for
*.ttc fonts are not required anymore.
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org