cvs commit: xml-fop/src/org/apache/fop/svg SVGElement.java SVGUserAgent.java

2002-06-10 Thread keiron

keiron  2002/06/10 01:53:41

  Modified:src/org/apache/fop/svg SVGElement.java SVGUserAgent.java
  Log:
  api change
  
  Revision  ChangesPath
  1.25  +7 -1  xml-fop/src/org/apache/fop/svg/SVGElement.java
  
  Index: SVGElement.java
  ===
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/svg/SVGElement.java,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- SVGElement.java   26 Apr 2002 09:40:58 -  1.24
  +++ SVGElement.java   10 Jun 2002 08:53:41 -  1.25
  @@ -1,5 +1,5 @@
   /*
  - * $Id: SVGElement.java,v 1.24 2002/04/26 09:40:58 keiron Exp $
  + * $Id: SVGElement.java,v 1.25 2002/06/10 08:53:41 keiron Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
  @@ -88,6 +88,9 @@
   public float getPixelToMM() {
   return ptmm;
   }
  +public float getPixelUnitToMillimeter() {
  +return ptmm;
  +}
   
   public Rectangle2D getBBox() {
   return new Rectangle2D.Double(0, 0, view.getX(), view.getY());
  @@ -188,6 +191,9 @@
* Returns the pixel to mm factor.
*/
   public float getPixelToMM() {
  +return pixeltoMM;
  +}
  +public float getPixelUnitToMillimeter() {
   return pixeltoMM;
   }
   
  
  
  
  1.10  +5 -1  xml-fop/src/org/apache/fop/svg/SVGUserAgent.java
  
  Index: SVGUserAgent.java
  ===
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/svg/SVGUserAgent.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- SVGUserAgent.java 11 Apr 2002 09:33:31 -  1.9
  +++ SVGUserAgent.java 10 Jun 2002 08:53:41 -  1.10
  @@ -1,5 +1,5 @@
   /*
  - * $Id: SVGUserAgent.java,v 1.9 2002/04/11 09:33:31 keiron Exp $
  + * $Id: SVGUserAgent.java,v 1.10 2002/06/10 08:53:41 keiron Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
  @@ -80,6 +80,10 @@
* Returns a customized the pixel to mm factor.
*/
   public float getPixelToMM() {
  +return userAgent.getPixelToMM();
  +}
  +
  +public float getPixelUnitToMillimter() {
   return userAgent.getPixelToMM();
   }
   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]




cvs commit: xml-fop/src/org/apache/fop/svg SVGElement.java SVGUserAgent.java

2002-06-06 Thread keiron

keiron  2002/06/06 00:57:02

  Modified:src/org/apache/fop/image/analyser Tag: fop-0_20_2-maintain
SVGReader.java
   src/org/apache/fop/svg Tag: fop-0_20_2-maintain
SVGElement.java SVGUserAgent.java
  Log:
  YAAPIC
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.12.2.3  +6 -1  xml-fop/src/org/apache/fop/image/analyser/SVGReader.java
  
  Index: SVGReader.java
  ===
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/image/analyser/SVGReader.java,v
  retrieving revision 1.12.2.2
  retrieving revision 1.12.2.3
  diff -u -r1.12.2.2 -r1.12.2.3
  --- SVGReader.java13 May 2002 10:29:52 -  1.12.2.2
  +++ SVGReader.java6 Jun 2002 07:57:02 -   1.12.2.3
  @@ -1,5 +1,5 @@
   /*
  - * $Id: SVGReader.java,v 1.12.2.2 2002/05/13 10:29:52 keiron Exp $
  + * $Id: SVGReader.java,v 1.12.2.3 2002/06/06 07:57:02 keiron Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
  @@ -144,6 +144,11 @@
* Returns a customized the pixel to mm factor.
*/
   public float getPixelToMM() {
  +// this is set to 72dpi as the values in fo are 72dpi
  +return 0.3528f; // 72 dpi
  +// return 0.26458333f;// 96dpi
  +}
  +public float getPixelUnitToMillimeter() {
   // this is set to 72dpi as the values in fo are 72dpi
   return 0.3528f; // 72 dpi
   // return 0.26458333f;// 96dpi
  
  
  
  No   revision
  
  
  No   revision
  
  
  1.16.2.2  +6 -1  xml-fop/src/org/apache/fop/svg/SVGElement.java
  
  Index: SVGElement.java
  ===
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/svg/SVGElement.java,v
  retrieving revision 1.16.2.1
  retrieving revision 1.16.2.2
  diff -u -r1.16.2.1 -r1.16.2.2
  --- SVGElement.java   13 May 2002 10:29:52 -  1.16.2.1
  +++ SVGElement.java   6 Jun 2002 07:57:02 -   1.16.2.2
  @@ -1,5 +1,5 @@
   /*
  - * $Id: SVGElement.java,v 1.16.2.1 2002/05/13 10:29:52 keiron Exp $
  + * $Id: SVGElement.java,v 1.16.2.2 2002/06/06 07:57:02 keiron Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
  @@ -111,6 +111,11 @@
   final ForeignObjectArea foa = (ForeignObjectArea)area;
   SVGContext dc = new SVGContext() {
   public float getPixelToMM() {
  +// 72 dpi
  +return 0.3528f;
  +}
  +
  +public float getPixelUnitToMillimeter() {
   // 72 dpi
   return 0.3528f;
   }
  
  
  
  1.2.2.4   +7 -1  xml-fop/src/org/apache/fop/svg/SVGUserAgent.java
  
  Index: SVGUserAgent.java
  ===
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/svg/SVGUserAgent.java,v
  retrieving revision 1.2.2.3
  retrieving revision 1.2.2.4
  diff -u -r1.2.2.3 -r1.2.2.4
  --- SVGUserAgent.java 13 May 2002 10:29:53 -  1.2.2.3
  +++ SVGUserAgent.java 6 Jun 2002 07:57:02 -   1.2.2.4
  @@ -1,5 +1,5 @@
   /*
  - * $Id: SVGUserAgent.java,v 1.2.2.3 2002/05/13 10:29:53 keiron Exp $
  + * $Id: SVGUserAgent.java,v 1.2.2.4 2002/06/06 07:57:02 keiron Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
  @@ -75,6 +75,12 @@
* Returns a customized the pixel to mm factor.
*/
   public float getPixelToMM() {
  +// this is set to 72dpi as the values in fo are 72dpi
  +return 0.3528f; // 72 dpi
  +// return 0.26458333f;// 96dpi
  +}
  +
  +public float getPixelUnitToMillimeter() {
   // this is set to 72dpi as the values in fo are 72dpi
   return 0.3528f; // 72 dpi
   // return 0.26458333f;// 96dpi
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]