Hi Glenn and Chris,
I have created the following issue for creating a junit test for this:
https://issues.apache.org/jira/browse/FOP-2181
I did look into creating an AT test for this originally, but because the AT
tests don't seem to support specifying an xconf section or file reference, the
test I wanted to create would not work. I may look into adding support for this
optional section in the future myself if I get the chance.
Regards,
Robert
From: rme...@hotmail.co.uk
To: fop-dev@xmlgraphics.apache.org
Subject: RE: svn commit: r1428918 - in /xmlgraphics/fop/trunk:
src/java/org/apache/fop/layoutmgr/inline/ImageLayout.java status.xml
Date: Fri, 4 Jan 2013 16:58:59 +
Hi,
I'll look into creating an AT test and / or junit test next week for this. I'll
update the existing jira issue if that's possible, but if not then I'll create
a new one.
Regards,
Robert
Date: Fri, 4 Jan 2013 16:43:12 +
From: bowditch_ch...@hotmail.com
To: fop-dev@xmlgraphics.apache.org
Subject: Re: svn commit: r1428918 - in /xmlgraphics/fop/trunk:
src/java/org/apache/fop/layoutmgr/inline/ImageLayout.java status.xml
Hi Glenn,
Rob didn't submit one, but since the change affects layout that is a
reasonable request.
Thanks,
Chris
On 04/01/2013 16:25, Glenn Adams wrote:
are there any new tests to go along with this?
On Fri, Jan 4, 2013 at 9:11 AM, cbowdi...@apache.org
mailto:cbowdi...@apache.org wrote:
Author: cbowditch
Date: Fri Jan 4 15:11:52 2013
New Revision: 1428918
URL: http://svn.apache.org/viewvc?rev=1428918view=rev
Log:
Jira FOP-2174: When using SVG drawings, if no content-width and
content-height is specified, 72 will be used instead of the
source-resolution option
Patch submitted by Robert Meyer (rmeyer at hotmail dot co dot uk)
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/ImageLayout.java
xmlgraphics/fop/trunk/status.xml
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/ImageLayout.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/ImageLayout.java?rev=1428918r1=1428917r2=1428918view=diff
==
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/ImageLayout.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/ImageLayout.java
Fri Jan 4 15:11:52 2013
@@ -25,10 +25,14 @@ import java.awt.Rectangle;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.xmlgraphics.util.UnitConv;
+
import org.apache.fop.datatypes.Length;
import org.apache.fop.datatypes.PercentBaseContext;
import org.apache.fop.fo.Constants;
import org.apache.fop.fo.GraphicsProperties;
+import org.apache.fop.fo.expr.PropertyException;
+import org.apache.fop.fo.flow.AbstractGraphics;
import org.apache.fop.fo.properties.LengthRangeProperty;
/**
@@ -98,9 +102,9 @@ public class ImageLayout implements Cons
boolean constrainIntrinsicSize = false;
int cwidth = -1;
int cheight = -1;
-len = props.getContentWidth();
-if (len.getEnum() != EN_AUTO) {
-switch (len.getEnum()) {
+Length lenWidth = props.getContentWidth();
+if (lenWidth.getEnum() != EN_AUTO) {
+switch (lenWidth.getEnum()) {
case EN_SCALE_TO_FIT:
if (ipd != -1) {
cwidth = ipd;
@@ -120,12 +124,12 @@ public class ImageLayout implements Cons
constrainIntrinsicSize = true;
break;
default:
-cwidth = len.getValue(percentBaseContext);
+cwidth = lenWidth.getValue(percentBaseContext);
}
}
-len = props.getContentHeight();
-if (len.getEnum() != EN_AUTO) {
-switch (len.getEnum()) {
+Length lenHeight = props.getContentHeight();
+if (lenHeight.getEnum() != EN_AUTO) {
+switch (lenHeight.getEnum()) {
case EN_SCALE_TO_FIT:
if (bpd != -1) {
cheight = bpd;
@@ -145,10 +149,21 @@ public class ImageLayout implements Cons
constrainIntrinsicSize = true;
break;
default:
-cheight = len.getValue(percentBaseContext);
+cheight = lenHeight.getValue(percentBaseContext);
}
}
+//If no content-width or
