You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by vm...@apache.org on 2003/04/24 04:48:09 UTC

cvs commit: xml-fop/src/java/org/apache/fop/image XMLImage.java

vmote       2003/04/23 19:48:08

  Modified:    src/java/org/apache/fop/render AbstractRenderer.java
                        package.html
               src/java/org/apache/fop/datatypes Keep.java
               src/java/org/apache/fop/pdf package.html PDFDocument.java
               src/java/org/apache/fop/render/pdf package.html
               src/java/org/apache/fop/render/xml package.html
               src/java/org/apache/fop/layout/hyphenation TernaryTree.java
               src/java/org/apache/fop/fonts/truetype TTFFile.java
               src/java/org/apache/fop/image XMLImage.java
  Log:
  javadoc changes to clean up gump warnings.
  
  Revision  Changes    Path
  1.2       +15 -15    xml-fop/src/java/org/apache/fop/render/AbstractRenderer.java
  
  Index: AbstractRenderer.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/AbstractRenderer.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- AbstractRenderer.java	11 Mar 2003 13:05:39 -0000	1.1
  +++ AbstractRenderer.java	24 Apr 2003 02:48:08 -0000	1.2
  @@ -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
    *    apache@apache.org.
  - * 
  + *
    * 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 <jt...@jtauber.com>. For more information on the Apache
    * Software Foundation, please see <http://www.apache.org/>.
  - */ 
  + */
   package org.apache.fop.render;
   
   // Java
  @@ -176,7 +176,7 @@
       }
   
       /**
  -     * @param ext  @todo Description of the Parameter
  +     * @param ext  <todo> Description of the Parameter
        * @see        org.apache.fop.render.Renderer
        */
       public void renderExtension(TreeExt ext) { }
  @@ -293,7 +293,7 @@
       }
   
       /**
  -     * @todo Description of the Method
  +     * <todo> Description of the Method
        *
        * @param ctm  The coordinate transformation matrix to use
        */
  @@ -311,7 +311,7 @@
       }
   
       /**
  -     * @todo Description of the Method
  +     * <todo> Description of the Method
        */
       protected void endVParea() { }
   
  @@ -550,7 +550,7 @@
        *
        * @param image  The image
        * @param pos    The target position of the image
  -     * @todo Make renderImage() protected
  +     * <todo> Make renderImage() protected
        */
       public void renderImage(Image image, Rectangle2D pos) {
           // Default: do nothing.
  @@ -576,7 +576,7 @@
        *
        * @param fo   The foreign object area
        * @param pos  The target position of the foreign object
  -     * @todo Make renderForeignObject() protected
  +     * <todo> Make renderForeignObject() protected
        */
       public void renderForeignObject(ForeignObject fo, Rectangle2D pos) {
           // Default: do nothing.
  
  
  
  1.2       +1 -1      xml-fop/src/java/org/apache/fop/render/package.html
  
  Index: package.html
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/package.html,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- package.html	11 Mar 2003 13:05:39 -0000	1.1
  +++ package.html	24 Apr 2003 02:48:08 -0000	1.2
  @@ -1,6 +1,6 @@
   <HTML>
   <TITLE>org.apache.fop.render Package</TITLE>
   <BODY>
  -<P>generic renderer interface</P>
  +<P>Generic renderer interface.</P>
   </BODY>
   </HTML>
  
  
  
  1.2       +11 -11    xml-fop/src/java/org/apache/fop/datatypes/Keep.java
  
  Index: Keep.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/datatypes/Keep.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Keep.java	11 Mar 2003 13:05:36 -0000	1.1
  +++ Keep.java	24 Apr 2003 02:48:08 -0000	1.2
  @@ -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
    *    apache@apache.org.
  - * 
  + *
    * 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 <jt...@jtauber.com>. For more information on the Apache
    * Software Foundation, please see <http://www.apache.org/>.
  - */ 
  + */
   package org.apache.fop.datatypes;
   
   import org.apache.fop.fo.Property;
  @@ -114,7 +114,7 @@
       }
   
       /**
  -     * What to do here?? There isn't really a meaningful single value.
  +     * Not sure what to do here. There isn't really a meaningful single value.
        */
       public String toString() {
           return "Keep";
  
  
  
  1.2       +1 -1      xml-fop/src/java/org/apache/fop/pdf/package.html
  
  Index: package.html
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/pdf/package.html,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- package.html	11 Mar 2003 13:05:09 -0000	1.1
  +++ package.html	24 Apr 2003 02:48:08 -0000	1.2
  @@ -1,7 +1,7 @@
   <HTML>
   <TITLE>org.apache.fop.pdf Package</TITLE>
   <BODY>
  -<P>Classes for handling the low-level creation of PDF documents</P>
  +<P>Classes for handling the low-level creation of PDF documents.</P>
   <P>These classes were developed for FOP, but could be used by other
   applications wishing to produce PDF.</P>
   </BODY>
  
  
  
  1.5       +33 -33    xml-fop/src/java/org/apache/fop/pdf/PDFDocument.java
  
  Index: PDFDocument.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/pdf/PDFDocument.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- PDFDocument.java	27 Mar 2003 11:15:27 -0000	1.4
  +++ PDFDocument.java	24 Apr 2003 02:48:08 -0000	1.5
  @@ -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
    *    apache@apache.org.
  - * 
  + *
    * 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 <jt...@jtauber.com>. For more information on the Apache
    * Software Foundation, please see <http://www.apache.org/>.
  - */ 
  + */
   package org.apache.fop.pdf;
   
   // Java
  @@ -88,7 +88,7 @@
    *
    */
   public class PDFDocument implements LogEnabled {
  -    
  +
       private static final Integer LOCATION_PLACEHOLDER = new Integer(0);
       /**
        * the version of PDF supported which is 1.4
  @@ -234,11 +234,11 @@
   
   
       private PDFFactory factory;
  -    
  +
       private boolean encodingOnTheFly = true;
   
       /**
  -     * creates an empty PDF document <p>
  +     * Creates an empty PDF document.
        *
        * The constructor creates a /Root and /Pages object to
        * track the document but does not write these objects until
  @@ -293,7 +293,7 @@
   
       /**
        * Helper method to allow sub-classes to aquire logger.
  -     * 
  +     *
        * <p>There is no performance penalty as this is a final method
        * and will be inlined by the JVM.</p>
        * @return the Logger
  @@ -312,7 +312,7 @@
               return text.getBytes(ENCODING);
           } catch (UnsupportedEncodingException uee) {
               return text.getBytes();
  -        }       
  +        }
       }
   
       /**
  @@ -378,7 +378,7 @@
       }
   
       /**
  -     * Registers a PDFObject in this PDF document. The PDF is assigned a new 
  +     * Registers a PDFObject in this PDF document. The PDF is assigned a new
        * object number.
        * @param obj PDFObject to add
        * @return PDFObject the PDFObject added (its object number set)
  @@ -390,7 +390,7 @@
       }
   
       /**
  -     * Assigns the PDFObject a object number and sets the parent of the 
  +     * Assigns the PDFObject a object number and sets the parent of the
        * PDFObject to this PDFDocument.
        * @param obj PDFObject to assign a number to
        */
  @@ -407,7 +407,7 @@
               throw new IllegalStateException("Error registering a PDFObject: "
                   + "PDFObject already has a parent PDFDocument");
           }
  -        
  +
           obj.setObjectNumber(++this.objectcount);
   
           if (currentParent == null) {
  @@ -431,9 +431,9 @@
   
           //Add object to list
           this.objects.add(obj);
  -        
  +
           //System.out.println("Registering: "+obj);
  -        
  +
           //Add object to special lists where necessary
           if (obj instanceof PDFFunction) {
               this.functions.add(obj);
  @@ -460,7 +460,7 @@
           }
           if (obj instanceof PDFLink) {
               this.links.add(obj);
  -        }            
  +        }
           if (obj instanceof PDFFileSpec) {
               this.filespecs.add(obj);
           }
  @@ -478,10 +478,10 @@
        */
       public void addTrailerObject(PDFObject obj) {
           this.trailerObjects.add(obj);
  -        
  +
           if (obj instanceof PDFGoTo) {
               this.gotos.add(obj);
  -        }            
  +        }
       }
   
       /**
  @@ -509,8 +509,8 @@
                   + "generated without encryption.");
           }
       }
  -    
  -    
  +
  +
       /**
        * Indicates whether encryption is active for this PDF or not.
        * @return boolean True if encryption is active
  @@ -518,7 +518,7 @@
       public boolean isEncryptionActive() {
           return this.encryption != null;
       }
  -    
  +
       /**
        * Returns the active Encryption object.
        * @return the Encryption object
  @@ -613,7 +613,7 @@
       protected PDFGoTo findGoTo(PDFGoTo compare) {
           return (PDFGoTo)findPDFObject(gotos, compare);
       }
  -    
  +
       /**
        * Looks for an existing GState to use
        * @param wanted requested features
  @@ -680,7 +680,7 @@
        * @throws java.io.FileNotFoundException if the URI could not be resolved
        * @return the InputStream from the URI.
        */
  -    protected InputStream resolveURI(String uri) 
  +    protected InputStream resolveURI(String uri)
                   throws java.io.FileNotFoundException {
           try {
               /**@todo Temporary hack to compile, improve later */
  @@ -738,12 +738,12 @@
           return xObject;
       }
   
  -    /** 
  +    /**
        * Add a form XObject to the PDF document.
        * This adds a Form XObject to the PDF objects.
        * If a Form XObject with the same key already exists it will return the
        * old PDFFormXObject.
  -     *  
  +     *
        * @param res the PDF resource context to add to, may be null
        * @param cont the PDF Stream contents of the Form XObject
        * @param formres the PDF Resources for the Form XObject data
  @@ -833,7 +833,7 @@
       }
   
       /**
  -     * write the PDF header <P>
  +     * Write the PDF header.
        *
        * This method must be called prior to formatting
        * and outputting AreaTrees.
  @@ -886,8 +886,8 @@
           /* construct the trailer */
           String pdf = "trailer\n" + "<<\n"
                        + "/Size " + (this.objectcount + 1) + "\n"
  -                     + "/Root " + this.root.referencePDF() + "\n" 
  -                     + "/Info " + this.info.referencePDF() + "\n" 
  +                     + "/Root " + this.root.referencePDF() + "\n"
  +                     + "/Info " + this.info.referencePDF() + "\n"
                        + encryptEntry
                        + ">>\n" + "startxref\n" + this.xref
                        + "\n" + "%%EOF\n";
  
  
  
  1.2       +1 -1      xml-fop/src/java/org/apache/fop/render/pdf/package.html
  
  Index: package.html
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/pdf/package.html,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- package.html	11 Mar 2003 13:05:13 -0000	1.1
  +++ package.html	24 Apr 2003 02:48:08 -0000	1.2
  @@ -1,6 +1,6 @@
   <HTML>
   <TITLE>org.apache.fop.render.pdf Package</TITLE>
   <BODY>
  -<P>classes for rendering to PDF</P>
  +<P>Classes for rendering to PDF.</P>
   </BODY>
   </HTML>
  
  
  
  1.2       +1 -1      xml-fop/src/java/org/apache/fop/render/xml/package.html
  
  Index: package.html
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/xml/package.html,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- package.html	11 Mar 2003 13:05:31 -0000	1.1
  +++ package.html	24 Apr 2003 02:48:08 -0000	1.2
  @@ -1,6 +1,6 @@
   <HTML>
   <TITLE>org.apache.fop.render.xml Package</TITLE>
   <BODY>
  -<P>classes for rendering to XML for debugging</P>
  +<P>Classes for rendering to XML for debugging.</P>
   </BODY>
   </HTML>
  
  
  
  1.2       +11 -11    xml-fop/src/java/org/apache/fop/layout/hyphenation/TernaryTree.java
  
  Index: TernaryTree.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layout/hyphenation/TernaryTree.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TernaryTree.java	11 Mar 2003 13:05:33 -0000	1.1
  +++ TernaryTree.java	24 Apr 2003 02:48:08 -0000	1.2
  @@ -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
    *    apache@apache.org.
  - * 
  + *
    * 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 <jt...@jtauber.com>. For more information on the Apache
    * Software Foundation, please see <http://www.apache.org/>.
  - */ 
  + */
   package org.apache.fop.layout.hyphenation;
   
   import java.util.Enumeration;
  @@ -55,7 +55,7 @@
   import java.io.Serializable;
   
   /**
  - * <h2>Ternary Search Tree</h2>
  + * <h2>Ternary Search Tree.</h2>
    *
    * <p>A ternary search tree is a hibrid between a binary tree and
    * a digital search tree (trie). Keys are limited to strings.
  
  
  
  1.3       +18 -18    xml-fop/src/java/org/apache/fop/fonts/truetype/TTFFile.java
  
  Index: TTFFile.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fonts/truetype/TTFFile.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- TTFFile.java	27 Mar 2003 10:06:16 -0000	1.2
  +++ TTFFile.java	24 Apr 2003 02:48:08 -0000	1.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
    *    apache@apache.org.
  - * 
  + *
    * 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 <jt...@jtauber.com>. For more information on the Apache
    * Software Foundation, please see <http://www.apache.org/>.
  - */ 
  + */
   package org.apache.fop.fonts.truetype;
   
   import java.io.IOException;
  @@ -129,7 +129,7 @@
   
       private int ansiWidth[];
       private Map ansiIndex;
  -    
  +
       private TTFDirTabEntry currentDirTab;
   
       /**
  @@ -745,8 +745,8 @@
   
       /**
        * Read the "hhea" table to find the ascender and descender and
  -     * size of "hmtx" table, i.e. a fixed size font might have only
  -     * one width
  +     * size of "hmtx" table, as a fixed size font might have only
  +     * one width.
        * @param in FontFileReader to read the hhea table from
        * @throws IOException in case of an I/O problem
        */
  @@ -841,12 +841,12 @@
           case 0x00020000:
               getLogger().debug("PostScript format 2");
               int numGlyphStrings = 0;
  -            
  +
               // Read Number of Glyphs
  -            int l = in.readTTFUShort();      
  -            
  +            int l = in.readTTFUShort();
  +
               // Read indexes
  -            for (int i = 0; i < l; i++) {    
  +            for (int i = 0; i < l; i++) {
                   mtxTab[i].setIndex(in.readTTFUShort());
   
                   if (mtxTab[i].getIndex() > 257) {
  @@ -858,7 +858,7 @@
                       getLogger().debug("PostScript index: " + mtxTab[i].getIndexAsString());
                   }
               }
  -            
  +
               // firstChar=minIndex;
               String[] psGlyphsBuffer = new String[numGlyphStrings];
               if (getLogger().isDebugEnabled()) {
  
  
  
  1.2       +13 -13    xml-fop/src/java/org/apache/fop/image/XMLImage.java
  
  Index: XMLImage.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/image/XMLImage.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- XMLImage.java	11 Mar 2003 13:05:25 -0000	1.1
  +++ XMLImage.java	24 Apr 2003 02:48:08 -0000	1.2
  @@ -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
    *    apache@apache.org.
  - * 
  + *
    * 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 <jt...@jtauber.com>. For more information on the Apache
    * Software Foundation, please see <http://www.apache.org/>.
  - */ 
  + */
   package org.apache.fop.image;
   
   // Java
  @@ -58,17 +58,17 @@
   
   /**
    * This is an implementation for XML-based images such as SVG.
  - * 
  + *
    * @see AbstractFopImage
    * @see FopImage
    */
   public class XMLImage extends AbstractFopImage {
  -    
  +
       private Document doc;
       private String namespace = "";
   
       /**
  -     * @see org.apache.fop.image.AbstractFopImage#AbstractFopImage(ImageInfo)
  +     * @see org.apache.fop.image.AbstractFopImage#AbstractFopImage(FopImage.ImageInfo)
        */
       public XMLImage(FopImage.ImageInfo imgInfo) {
           super(imgInfo);
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: fop-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: fop-cvs-help@xml.apache.org