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

2003-06-03 Thread jeremias 
jeremias2003/06/02 13:21:28

  Modified:src/org/apache/fop/svg Tag: fop-0_20_2-maintain
PDFImageElementBridge.java
  Log:
  Adjust to changes in Batik CVS
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.1.2.3   +16 -11xml-fop/src/org/apache/fop/svg/Attic/PDFImageElementBridge.java
  
  Index: PDFImageElementBridge.java
  ===
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/svg/Attic/PDFImageElementBridge.java,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- PDFImageElementBridge.java25 Feb 2003 15:08:11 -  1.1.2.2
  +++ PDFImageElementBridge.java2 Jun 2003 20:21:28 -   1.1.2.3
  @@ -3,34 +3,34 @@
* 
*The Apache Software License, Version 1.1
* 
  - * 
  + *
* Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
  - * 
  + *
* Redistribution and use in source and binary forms, with or without modifica-
* tion, are permitted provided that the following conditions are met:
  - * 
  + *
* 1. Redistributions of source code must retain the above copyright notice,
*this list of conditions and the following disclaimer.
  - * 
  + *
* 2. Redistributions in binary form must reproduce the above copyright notice,
*this list of conditions and the following disclaimer in the documentation
*and/or other materials provided with the distribution.
  - * 
  + *
* 3. The end-user documentation included with the redistribution, if any, must
*include the following acknowledgment: "This product includes software
*developed by the Apache Software Foundation (http://www.apache.org/)."
*Alternately, this acknowledgment may appear in the software itself, if
*and wherever such third-party acknowledgments normally appear.
  - * 
  + *
* 4. The names "FOP" and "Apache Software Foundation" must not be used to
*endorse or promote products derived from this software without prior
*written permission. For written permission, please contact
*[EMAIL PROTECTED]
  - * 
  + *
* 5. Products derived from this software may not be called "Apache", nor may
*"Apache" appear in their name, without prior written permission of the
*Apache Software Foundation.
  - * 
  + *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
  @@ -42,12 +42,12 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* 
  - * 
  + *
* This software consists of voluntary contributions made by many individuals
* on behalf of the Apache Software Foundation and was originally created by
* James Tauber <[EMAIL PROTECTED]>. For more information on the Apache
* Software Foundation, please see .
  - */ 
  + */
   package org.apache.fop.svg;
   
   import org.apache.batik.bridge.*;
  @@ -137,6 +137,11 @@
   }
   return null;
   }
  +
  +public Rectangle2D getSensitiveBounds() {
  +return getPrimitiveBounds();
  +}
  +
   }
   
   }
  
  
  

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

cvs commit: xml-fop/src/org/apache/fop/svg PDFImageElementBridge.java PDFGraphics2D.java PDFTextPainter.java PDFTranscoder.java SVGUserAgent.java

2001-10-11 Thread keiron 

keiron  01/10/11 23:40:13

  Modified:src/org/apache/fop/image/analyser SVGReader.java
   src/org/apache/fop/layout LineArea.java
   src/org/apache/fop/render/svg SVGRenderer.java
   src/org/apache/fop/svg PDFGraphics2D.java
PDFTextPainter.java PDFTranscoder.java
SVGUserAgent.java
  Added:   src/org/apache/fop/svg PDFImageElementBridge.java
  Log:
  changed api associated with batik to current batik
  added a half implemented bridge for jpg images
  
  Revision  ChangesPath
  1.12  +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.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- SVGReader.java2001/09/25 12:32:36 1.11
  +++ SVGReader.java2001/10/12 06:40:12 1.12
  @@ -1,5 +1,5 @@
   /*
  - * $Id: SVGReader.java,v 1.11 2001/09/25 12:32:36 keiron Exp $
  + * $Id: SVGReader.java,v 1.12 2001/10/12 06:40:12 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.
  @@ -155,6 +155,11 @@
   public String getLanguages() {
   return "en"; // userLanguages;
   }
  +
  +public String getMedia() {
  +return "";
  +}
  +
   
   /**
* Returns the user stylesheet uri.
  
  
  
  1.53  +2 -2  xml-fop/src/org/apache/fop/layout/LineArea.java
  
  Index: LineArea.java
  ===
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/layout/LineArea.java,v
  retrieving revision 1.52
  retrieving revision 1.53
  diff -u -r1.52 -r1.53
  --- LineArea.java 2001/10/05 11:20:04 1.52
  +++ LineArea.java 2001/10/12 06:40:12 1.53
  @@ -1,5 +1,5 @@
   /*
  - * $Id: LineArea.java,v 1.52 2001/10/05 11:20:04 keiron Exp $
  + * $Id: LineArea.java,v 1.53 2001/10/12 06:40:12 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.
  @@ -876,7 +876,7 @@
   private String getHyphenationWord(char[] characters, int wordStart) {
   boolean wordendFound = false;
   int counter = 0;
  -char[] newWord = new char[100];// create a buffer
  +char[] newWord = new char[characters.length];// create a buffer
   while ((!wordendFound)
  && ((wordStart + counter) < characters.length)) {
   char tk = characters[wordStart + counter];
  
  
  
  1.2   +8 -11 xml-fop/src/org/apache/fop/render/svg/SVGRenderer.java
  
  Index: SVGRenderer.java
  ===
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/render/svg/SVGRenderer.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SVGRenderer.java  2001/10/05 09:49:21 1.1
  +++ SVGRenderer.java  2001/10/12 06:40:12 1.2
  @@ -1,5 +1,5 @@
   /*
  - * $Id: SVGRenderer.java,v 1.1 2001/10/05 09:49:21 keiron Exp $
  + * $Id: SVGRenderer.java,v 1.2 2001/10/12 06:40:12 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.
  @@ -98,13 +98,6 @@
   protected float currentBlue = 0;
   
   /**
  - * The parent component, used to set up the font.
  - * This is needed as FontSetup needs a live AWT component
  - * in order to generate valid font measures.
  - */
  -protected Component parent;
  -
  -/**
* options
*/
   protected Hashtable options;
  @@ -607,9 +600,13 @@
 throws IOException {
   DOMImplementation impl = SVGDOMImplementation.getDOMImplementation();
   svgDocument = impl.createDocument(svgNS, "svg", null);
  -
  -svgRoot = svgDocument.getDocumentElement();
  -}
  +ProcessingInstruction pi = 
  + svgDocument.createProcessingInstruction(
  + "xml",
  + " version=\"1.0\" encoding=\"ISO-8859-1\"");
  + svgRoot = svgDocument.getDocumentElement();
  +svgDocument.insertBefore(pi, svgRoot);
  + }
   
   public void stopRenderer(OutputStream outputStream)
   throws IOException {
  
  
  
  1.19  +36 -8 xml-fop/src/org/apache/fop/svg/PDFGraphics2D.java
  
  Index: PDFGraphics2D.java
  ===
  RCS file: /home/cvs/xml-fop/src/org/a