deweese 2003/08/29 10:04:31
Modified: sources/org/apache/batik/css/engine CSSEngine.java
sources/org/apache/batik/transcoder
SVGAbstractTranscoder.java
Log:
1) The CSS engine now applies the 'all' media type to all content.
('all' media type is the default for @import).
2) The image transcoders now default w/h to 400x400 if they can't get
a good definition anywhere else.
Revision Changes Path
1.33 +3 -1 xml-batik/sources/org/apache/batik/css/engine/CSSEngine.java
Index: CSSEngine.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/css/engine/CSSEngine.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- CSSEngine.java 22 Aug 2003 10:49:06 -0000 1.32
+++ CSSEngine.java 29 Aug 2003 17:04:31 -0000 1.33
@@ -1314,6 +1314,8 @@
return true;
}
for (int i = 0; i < ml.getLength(); i++) {
+ if (ml.item(i).equalsIgnoreCase("all"))
+ return true;
for (int j = 0; j < media.getLength(); j++) {
if (media.item(j).equalsIgnoreCase("all") ||
ml.item(i).equalsIgnoreCase(media.item(j))) {
1.14 +5 -6
xml-batik/sources/org/apache/batik/transcoder/SVGAbstractTranscoder.java
Index: SVGAbstractTranscoder.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/transcoder/SVGAbstractTranscoder.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- SVGAbstractTranscoder.java 22 Aug 2003 10:49:06 -0000 1.13
+++ SVGAbstractTranscoder.java 29 Aug 2003 17:04:31 -0000 1.14
@@ -138,9 +138,9 @@
protected GVTBuilder builder;
/**
- * Image's width and height.
+ * Image's width and height (init to 400x400).
*/
- protected float width, height;
+ protected float width=400, height=400;
/** The user agent dedicated to an SVG Transcoder. */
protected UserAgent userAgent;
@@ -788,9 +788,8 @@
* Returns the default size of this user agent (400x400).
*/
public Dimension2D getViewportSize() {
- return new Dimension
- ((int)SVGAbstractTranscoder.this.width,
- (int)SVGAbstractTranscoder.this.height);
+ return new Dimension((int)SVGAbstractTranscoder.this.width,
+ (int)SVGAbstractTranscoder.this.height);
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
