You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xmlgraphics.apache.org by lb...@apache.org on 2013/03/05 02:00:36 UTC
svn commit: r1452610 - in /xmlgraphics/commons/trunk:
src/java/org/apache/xmlgraphics/image/loader/impl/imageio/PreloaderImageIO.java
status.xml
Author: lbernardo
Date: Tue Mar 5 01:00:35 2013
New Revision: 1452610
URL: http://svn.apache.org/r1452610
Log:
FOP-2219, AKA XGC-79, reverts XGC-76: original and change revert submitted by Robert Meyer
Modified:
xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/loader/impl/imageio/PreloaderImageIO.java
xmlgraphics/commons/trunk/status.xml
Modified: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/loader/impl/imageio/PreloaderImageIO.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/loader/impl/imageio/PreloaderImageIO.java?rev=1452610&r1=1452609&r2=1452610&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/loader/impl/imageio/PreloaderImageIO.java (original)
+++ xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/loader/impl/imageio/PreloaderImageIO.java Tue Mar 5 01:00:35 2013
@@ -34,7 +34,6 @@ import org.apache.xmlgraphics.image.load
import org.apache.xmlgraphics.image.loader.ImageSize;
import org.apache.xmlgraphics.image.loader.impl.AbstractImagePreloader;
import org.apache.xmlgraphics.image.loader.util.ImageUtil;
-import org.apache.xmlgraphics.util.UnitConv;
/**
* Image preloader for images supported by ImageIO.
@@ -97,8 +96,8 @@ public class PreloaderImageIO extends Ab
}
}
- //Resolution set to default as scaling is now handled elsewhere
- size.setResolution(UnitConv.IN2PT);
+ //Resolution (first a default, then try to read the metadata)
+ size.setResolution(context.getSourceResolution());
ImageIOUtil.extractResolution(iiometa, size);
if (size.getWidthPx() <= 0 || size.getHeightPx() <= 0) {
//Watch out for a special case: a TGA image was erroneously identified
Modified: xmlgraphics/commons/trunk/status.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/status.xml?rev=1452610&r1=1452609&r2=1452610&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/status.xml (original)
+++ xmlgraphics/commons/trunk/status.xml Tue Mar 5 01:00:35 2013
@@ -39,10 +39,6 @@
</contexts>
<changes>
<release version="Trunk" date="n/a">
- <action context="Code" dev="CB" type="fix" fixes-bug="XGC-76" due-to="Robert Meyer">
- Dependant on FOP-2174 - Change to XGC to support the changes in FOP for image scaling.
- Scaling by resolution is removed to avoid duplicate scaling.
- </action>
<action context="Code" dev="MH" type="update">
Updated the JUnit tests to JUnit v4.
</action>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: commits-help@xmlgraphics.apache.org