Author: gadams
Date: Sun Dec 30 04:42:43 2012
New Revision: 1426888
URL: http://svn.apache.org/viewvc?rev=1426888&view=rev
Log:
FOP-2160: Fix NPE when rl writing mode is used in certain contexts.
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/InlineArea.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/bidi/UnflattenProcessor.java
xmlgraphics/fop/trunk/status.xml
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/InlineArea.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/InlineArea.java?rev=1426888&r1=1426887&r2=1426888&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/InlineArea.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/InlineArea.java
Sun Dec 30 04:42:43 2012
@@ -137,6 +137,14 @@ public class InlineArea extends Area {
}
/**
+ * Sets the adjustment information from an existing object
+ * @param adjustingInfo the existing adjustment object
+ */
+ public void setAdjustingInfo(InlineAdjustingInfo adjustingInfo) {
+ this.adjustingInfo = adjustingInfo;
+ }
+
+ /**
* Modify the adjustment value in the adjustment information object
* @param adjustment the new adjustment value
*/
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/bidi/UnflattenProcessor.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/bidi/UnflattenProcessor.java?rev=1426888&r1=1426887&r2=1426888&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/bidi/UnflattenProcessor.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/bidi/UnflattenProcessor.java
Sun Dec 30 04:42:43 2012
@@ -279,6 +279,7 @@ class UnflattenProcessor {
assert f != null;
fc.setIPD ( f.getIPD() );
fc.setUnitWidth ( f.getUnitWidth() );
+ fc.setAdjustingInfo( f.getAdjustingInfo() );
}
private InlineParent generateInlineContainer0 ( InlineParent i ) {
InlineParent ic = new InlineParent();
Modified: xmlgraphics/fop/trunk/status.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/status.xml?rev=1426888&r1=1426887&r2=1426888&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/status.xml (original)
+++ xmlgraphics/fop/trunk/status.xml Sun Dec 30 04:42:43 2012
@@ -59,6 +59,9 @@
documents. Example: the fix of marks layering will be such a case when
it's done.
-->
<release version="FOP Trunk" date="TBD">
+ <action context="Layout" dev="GA" type="fix" fixes-bug="FOP-2160"
due-to="Robert Meyer">
+ Fix NPE when rl writing mode is used in certain contexts.
+ </action>
<action context="Layout" dev="GA" type="fix" fixes-bug="FOP-2178">
Fix incomplete kerning when complex script features are enabled.
</action>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
