PDFBOX-5660: optimize, as suggested by Valery Bokov; closes #219

THausherr · THausherr · commit e6d7ee501932 · 2025-08-21T10:35:46.000Z
git-svn-id: https://svn.apache.org/repos/asf/pdfbox/trunk@1927943 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/AppearanceGeneratorHelper.java b/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/AppearanceGeneratorHelper.java
@@ -933,19 +933,20 @@ private float calculateFontSize(PDFont font, PDRectangle contentRect) throws IOE
             }
             else
             {
-                float yScalingFactor = FONTSCALE * font.getFontMatrix().getScaleY();
-                float xScalingFactor = FONTSCALE * font.getFontMatrix().getScaleX();
+                Matrix fontMatrix = font.getFontMatrix();
+                float yScalingFactor = FONTSCALE * fontMatrix.getScaleY();
+                float xScalingFactor = FONTSCALE * fontMatrix.getScaleX();
                 
                 // fit width
-                float width = font.getStringWidth(value) * font.getFontMatrix().getScaleX();
+                float width = font.getStringWidth(value) * fontMatrix.getScaleX();
                 float widthBasedFontSize = contentRect.getWidth() / width * xScalingFactor;
 
                 // fit height
                 float height = (font.getFontDescriptor().getCapHeight() +
-                               -font.getFontDescriptor().getDescent()) * font.getFontMatrix().getScaleY();
+                               -font.getFontDescriptor().getDescent()) * fontMatrix.getScaleY();
                 if (height <= 0)
                 {
-                    height = font.getBoundingBox().getHeight() * font.getFontMatrix().getScaleY();
+                    height = font.getBoundingBox().getHeight() * fontMatrix.getScaleY();
                 }
 
                 float heightBasedFontSize = contentRect.getHeight() / height * yScalingFactor;

Original file line number	Diff line number	Diff line change
`@@ -933,19 +933,20 @@ private float calculateFontSize(PDFont font, PDRectangle contentRect) throws IOE`
`933`	`933`	`}`
`934`	`934`	`else`
`935`	`935`	`{`
`936`		`- float yScalingFactor = FONTSCALE * font.getFontMatrix().getScaleY();`
`937`		`- float xScalingFactor = FONTSCALE * font.getFontMatrix().getScaleX();`
	`936`	`+ Matrix fontMatrix = font.getFontMatrix();`
	`937`	`+ float yScalingFactor = FONTSCALE * fontMatrix.getScaleY();`
	`938`	`+ float xScalingFactor = FONTSCALE * fontMatrix.getScaleX();`
`938`	`939`
`939`	`940`	`// fit width`
`940`		`- float width = font.getStringWidth(value) * font.getFontMatrix().getScaleX();`
	`941`	`+ float width = font.getStringWidth(value) * fontMatrix.getScaleX();`
`941`	`942`	`float widthBasedFontSize = contentRect.getWidth() / width * xScalingFactor;`
`942`	`943`
`943`	`944`	`// fit height`
`944`	`945`	`float height = (font.getFontDescriptor().getCapHeight() +`
`945`		`- -font.getFontDescriptor().getDescent()) * font.getFontMatrix().getScaleY();`
	`946`	`+ -font.getFontDescriptor().getDescent()) * fontMatrix.getScaleY();`
`946`	`947`	`if (height <= 0)`
`947`	`948`	`{`
`948`		`- height = font.getBoundingBox().getHeight() * font.getFontMatrix().getScaleY();`
	`949`	`+ height = font.getBoundingBox().getHeight() * fontMatrix.getScaleY();`
`949`	`950`	`}`
`950`	`951`
`951`	`952`	`float heightBasedFontSize = contentRect.getHeight() / height * yScalingFactor;`