chrisg 2002/11/25 11:43:42
Modified: src/org/apache/fop/layout Tag: fop-0_20_2-maintain
BorderAndPadding.java
Log:
Fixes bug from previous Perfomance tuning patch
Submitted by: Henrik Olsson <[EMAIL PROTECTED]>
Revision Changes Path
No revision
No revision
1.5.2.2 +5 -5 xml-fop/src/org/apache/fop/layout/BorderAndPadding.java
Index: BorderAndPadding.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/layout/BorderAndPadding.java,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -r1.5.2.1 -r1.5.2.2
--- BorderAndPadding.java 22 Nov 2002 15:10:48 -0000 1.5.2.1
+++ BorderAndPadding.java 25 Nov 2002 19:43:42 -0000 1.5.2.2
@@ -19,7 +19,7 @@
//ResolvedCondLength is long, mask wiht 0x100000000 != 0 is bDiscard
// mask wiht 0xFFFFFFFF is iLength
static final long bDiscard_MASK = 0x100000000L;
- static final long iLength_MASK = 0xFFFFFFFFL;
+ static final long iLength_MASK = 0x0FFFFFFFFL;
private static final long new_ResolvedCondLength(CondLength length) {
return (length.isDiscard()?bDiscard_MASK:0) + length.mvalue();
}
@@ -75,11 +75,11 @@
}
public void setPaddingLength(int side, int iLength) {
- padding[side] = iLength + padding[side]&bDiscard_MASK;
+ padding[side] = iLength + (padding[side] & bDiscard_MASK);
}
public void setBorderLength(int side, int iLength) {
- borderInfo[side].mWidth = iLength + borderInfo[side].mWidth&bDiscard_MASK;
+ borderInfo[side].mWidth = iLength + (borderInfo[side].mWidth &
bDiscard_MASK);
}
public int getBorderLeftWidth(boolean bDiscard) {
@@ -141,7 +141,7 @@
}
private int getPadding(int side, boolean bDiscard) {
- return (int)( padding[side]&iLength_MASK);
+ return (int)(padding[side]&iLength_MASK);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
