vhardy 02/02/21 02:04:33
Modified: sources/org/apache/batik/svggen
CachedImageHandlerBase64Encoder.java
Log:
Fixe <use> generation issue after <use> bridge bug fix
Revision Changes Path
1.3 +11 -11
xml-batik/sources/org/apache/batik/svggen/CachedImageHandlerBase64Encoder.java
Index: CachedImageHandlerBase64Encoder.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/svggen/CachedImageHandlerBase64Encoder.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CachedImageHandlerBase64Encoder.java 2 Nov 2001 12:58:30 -0000 1.2
+++ CachedImageHandlerBase64Encoder.java 21 Feb 2002 10:04:33 -0000 1.3
@@ -28,7 +28,7 @@
* encoder.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Paul Evenblij</a>
- * @version $Id: CachedImageHandlerBase64Encoder.java,v 1.2 2001/11/02 12:58:30
vhardy Exp $
+ * @version $Id: CachedImageHandlerBase64Encoder.java,v 1.3 2002/02/21 10:04:33
vhardy Exp $
*/
public class CachedImageHandlerBase64Encoder extends DefaultCachedImageHandler {
/**
@@ -74,21 +74,21 @@
// If scaling is necessary, create a transform, since "width" and "height"
// have no effect on a <use> element referring to an <image> element.
- AffineTransform af = null;
+ AffineTransform af = new AffineTransform();
double hRatio = dstWidth / srcWidth;
double vRatio = dstHeight / srcHeight;
+ af.translate(x,y);
+
if(hRatio != 1 || vRatio != 1) {
- af = AffineTransform.getScaleInstance(hRatio, vRatio);
+ af.scale(hRatio, vRatio);
+ }
+
+ if (!af.isIdentity()){
+ return af;
+ } else {
+ return null;
}
- imageElement.setAttributeNS(null,
- SVG_X_ATTRIBUTE,
- AbstractSVGConverter.doubleString(x));
- imageElement.setAttributeNS(null,
- SVG_Y_ATTRIBUTE,
- AbstractSVGConverter.doubleString(y));
-
- return af;
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
