diff options
| author | Glenn Adams <gadams@apache.org> | 2012-04-14 04:02:37 +0000 |
|---|---|---|
| committer | Glenn Adams <gadams@apache.org> | 2012-04-14 04:02:37 +0000 |
| commit | 3c558c69c28d79abd0710dba0651e4cd97a4e192 (patch) | |
| tree | 328aea97b57522cb73c32a3a12ff1ca22c5a7d09 | |
| parent | 687f603f1da25c4fbb0374f020a58e81333d303a (diff) | |
| download | xmlgraphics-fop-3c558c69c28d79abd0710dba0651e4cd97a4e192.tar.gz xmlgraphics-fop-3c558c69c28d79abd0710dba0651e4cd97a4e192.zip | |
Bugzilla #52514: Ensure square image is appropriately scaled.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1326053 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | src/java/org/apache/fop/layoutmgr/inline/ImageLayout.java | 3 | ||||
| -rw-r--r-- | status.xml | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/java/org/apache/fop/layoutmgr/inline/ImageLayout.java b/src/java/org/apache/fop/layoutmgr/inline/ImageLayout.java index 4c6bc1f3f..31ede9aee 100644 --- a/src/java/org/apache/fop/layoutmgr/inline/ImageLayout.java +++ b/src/java/org/apache/fop/layoutmgr/inline/ImageLayout.java @@ -228,6 +228,9 @@ public class ImageLayout implements Constants { } else if (rat1 > rat2) { adjusted.width = (int)(rat2 * size.width); adjusted.height = effHeight; + } else { + adjusted.width = effWidth; + adjusted.height = effHeight; } } else { adjusted.width = effWidth; diff --git a/status.xml b/status.xml index 3d91908f2..95f640639 100644 --- a/status.xml +++ b/status.xml @@ -62,6 +62,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="Code" dev="GA" type="fix" fixes-bug="52514" due-to="Luis Bernardo"> + Ensure square image is appropriately scaled. + </action> <action context="Code" dev="GA" type="fix" fixes-bug="50062"> Invoke JVM in headless mode from FOP command scripts and JS shell to prevent stealing focus from GUI applications. </action> |