diff options
| author | Robert Meyer <rmeyer@apache.org> | 2014-02-17 09:59:17 +0000 |
|---|---|---|
| committer | Robert Meyer <rmeyer@apache.org> | 2014-02-17 09:59:17 +0000 |
| commit | ce86f97648fbc8e168ec9ddb34c5cd340b4ff973 (patch) | |
| tree | c439c49f8a8b92b0629833ba944686c801284a87 | |
| parent | cd237ca578ea94320c0b9289059b72f79f091a29 (diff) | |
| download | xmlgraphics-fop-ce86f97648fbc8e168ec9ddb34c5cd340b4ff973.tar.gz xmlgraphics-fop-ce86f97648fbc8e168ec9ddb34c5cd340b4ff973.zip | |
FOP-2341: Infinite loop when smaller used with a zero length font-size
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1568925 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | src/java/org/apache/fop/fo/properties/FontSizePropertyMaker.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/java/org/apache/fop/fo/properties/FontSizePropertyMaker.java b/src/java/org/apache/fop/fo/properties/FontSizePropertyMaker.java index 72884a177..fe9c64cb7 100644 --- a/src/java/org/apache/fop/fo/properties/FontSizePropertyMaker.java +++ b/src/java/org/apache/fop/fo/properties/FontSizePropertyMaker.java @@ -105,6 +105,9 @@ public class FontSizePropertyMaker // than the last caculated step lastStepFontSize = nextStepFontSize; nextStepFontSize = (int)Math.round(lastStepFontSize * scale); + if (nextStepFontSize == lastStepFontSize) { + break; + } } // baseFontSize is between last and next step font size // Return the step value closer to the baseFontSize |