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 vh...@apache.org on 2008/07/24 11:37:16 UTC
svn commit: r679326 [23/33] - in /xmlgraphics/fop/trunk:
examples/embedding/java/embedding/ examples/embedding/java/embedding/events/
examples/embedding/java/embedding/intermediate/
examples/embedding/java/embedding/model/ examples/embedding/java/embed...
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/extensions/AFPPageSetup.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/extensions/AFPPageSetup.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/extensions/AFPPageSetup.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/extensions/AFPPageSetup.java Thu Jul 24 02:35:34 2008
@@ -49,7 +49,7 @@
/**
* Default constructor.
- *
+ *
* @param elementName the name of the setup code object, may be null
*/
public AFPPageSetup(String elementName) {
@@ -75,7 +75,7 @@
}
/**
- * @return the value
+ * @return the value
*/
public String getValue() {
return value;
@@ -88,7 +88,7 @@
public void setValue(String source) {
this.value = source;
}
-
+
/** {@inheritDoc} */
public String getCategory() {
return CATEGORY;
@@ -111,7 +111,7 @@
/** {@inheritDoc} */
public String toString() {
- return "AFPPageSetup(element-name=" + getElementName()
+ return "AFPPageSetup(element-name=" + getElementName()
+ " name=" + getName() + " value=" + getValue() + ")";
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/extensions/AbstractAFPExtensionObject.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/extensions/AbstractAFPExtensionObject.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/extensions/AbstractAFPExtensionObject.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/extensions/AbstractAFPExtensionObject.java Thu Jul 24 02:35:34 2008
@@ -37,9 +37,9 @@
* AFP setup code
*/
private AFPPageSetup setupCode;
-
+
private String name;
-
+
/**
* @see org.apache.fop.fo.FONode#FONode(FONode)
* @param parent the parent formatting object
@@ -62,7 +62,7 @@
/** {@inheritDoc} */
protected void addCharacters(char[] data, int start, int end,
PropertyList pList, Locator locator) {
- setupCode.setContent(new String(data, start, end - start));
+ setupCode.setContent(new String(data, start, end - start));
}
/** {@inheritDoc} */
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/fonts/AFPFontCollection.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/fonts/AFPFontCollection.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/fonts/AFPFontCollection.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/fonts/AFPFontCollection.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -39,19 +39,19 @@
private EventBroadcaster eventBroadcaster;
private List/*<EmbedFontInfo>*/ embedFontInfoList;
-
+
/**
* Main constructor
- *
+ *
* @param eventBroadcaster the event broadcaster
* @param embedFontInfoList the embed font info list
*/
- public AFPFontCollection(EventBroadcaster eventBroadcaster,
+ public AFPFontCollection(EventBroadcaster eventBroadcaster,
List/*<EmbedFontInfo>*/ embedFontInfoList) {
this.eventBroadcaster = eventBroadcaster;
this.embedFontInfoList = embedFontInfoList;
}
-
+
/** {@inheritDoc} */
public int setup(int start, FontInfo fontInfo) {
int num = 1;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/fonts/CharacterSet.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/fonts/CharacterSet.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/fonts/CharacterSet.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/fonts/CharacterSet.java Thu Jul 24 02:35:34 2008
@@ -73,7 +73,7 @@
/**
* Constructor for the CharacterSetMetric object, the character set is used
* to load the font information from the actual AFP font.
- *
+ *
* @param codePage the code page identifier
* @param encoding the encoding of the font
* @param name the character set name
@@ -105,7 +105,7 @@
/**
* Add character set metric information for the different orientations
- *
+ *
* @param cso the metrics for the orientation
*/
public void addCharacterSetOrientation(CharacterSetOrientation cso) {
@@ -124,7 +124,7 @@
* Ascender Height is the character�s most positive y-axis value.
* For bounded character boxes, for a given character having an
* ascender, ascender height and baseline offset are equal.
- *
+ *
* @return the ascender value in millipoints
*/
public int getAscender() {
@@ -136,7 +136,7 @@
* Cap height is the average height of the uppercase characters in
* a font. This value is specified by the designer of a font and is
* usually the height of the uppercase M.
- *
+ *
* @return the cap height value in millipoints
*/
public int getCapHeight() {
@@ -148,7 +148,7 @@
* Descender depth is the distance from the character baseline to
* the bottom of a character box. A negative descender depth signifies
* that all of the graphic character is above the character baseline.
- *
+ *
* @return the descender value in millipoints
*/
public int getDescender() {
@@ -158,7 +158,7 @@
/**
* The first character in the character set
- *
+ *
* @return the first character
*/
public int getFirstChar() {
@@ -168,7 +168,7 @@
/**
* Returns the last character in the character set
- *
+ *
* @return the last character
*/
public int getLastChar() {
@@ -178,7 +178,7 @@
/**
* Returns the path where the font resources are installed
- *
+ *
* @return the path where the font resources are installed
*/
public String getPath() {
@@ -187,7 +187,7 @@
/**
* Get the width (in 1/1000ths of a point size) of all characters
- *
+ *
* @return the widths of all characters
*/
public int[] getWidths() {
@@ -207,7 +207,7 @@
/**
* Get the width (in 1/1000ths of a point size) of the character
* identified by the parameter passed.
- *
+ *
* @param character the character from which the width will be calculated
* @return the width of the character
*/
@@ -230,7 +230,7 @@
/**
* Returns the AFP character set identifier
- *
+ *
* @return String
*/
public String getName() {
@@ -239,7 +239,7 @@
/**
* Returns the AFP character set identifier
- *
+ *
* @return the AFP character set identifier
*/
public byte[] getNameBytes() {
@@ -257,7 +257,7 @@
/**
* Returns the AFP code page identifier
- *
+ *
* @return the AFP code page identifier
*/
public String getCodePage() {
@@ -266,7 +266,7 @@
/**
* Returns the AFP code page encoding
- *
+ *
* @return the AFP code page encoding
*/
public String getEncoding() {
@@ -282,7 +282,7 @@
* the case for landscape prints which use an orientation of 270 degrees,
* in 99.9% of cases the font metrics will be the same as the 0 degrees
* therefore the implementation currely will always use 0 degrees.
- *
+ *
* @return characterSetOrentation The current orientation metrics.
*/
private CharacterSetOrientation getCharacterSetOrientation() {
@@ -297,7 +297,7 @@
* Map a Unicode character to a code point in the font.
* The code tables are already converted to Unicode therefore
* we can use the identity mapping.
- *
+ *
* @param c character to map
* @return the mapped character
*/
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/fonts/FopCharacterSet.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/fonts/FopCharacterSet.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/fonts/FopCharacterSet.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/fonts/FopCharacterSet.java Thu Jul 24 02:35:34 2008
@@ -45,7 +45,7 @@
String name,
int size,
Typeface charSet) {
-
+
super(codePage, encoding, name, null);
this.charSet = charSet;
this.size = size * 1000;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/AFPDataStream.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/AFPDataStream.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/AFPDataStream.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/AFPDataStream.java Thu Jul 24 02:35:34 2008
@@ -34,7 +34,7 @@
* destined for a presentation service, archive library, presentation device or
* another application program. The strategic presentation data stream
* architectures used is Mixed Object Document Content Architecture (MO:DCA�).
- *
+ *
* The MO:DCA architecture defines the data stream used by applications to
* describe documents and object envelopes for interchange with other
* applications and application services. Documents defined in the MO:DCA format
@@ -42,7 +42,7 @@
* printed in local or distributed systems environments. Presentation fidelity
* is accommodated by including resource objects in the documents that reference
* them.
- *
+ *
*/
public class AFPDataStream {
@@ -142,7 +142,7 @@
/**
* The document is started by invoking this method which creates an instance
* of the AFP Document object.
- *
+ *
* @param docOutputStream
* the outputStream which the document is written to.
*/
@@ -163,7 +163,7 @@
* The document is ended by invoking this method which creates an instance
* of the AFP Document object and registers the start with a validation map
* which ensures that methods are not invoked out of the correct sequence.
- *
+ *
* @throws java.io.IOException
* throws an I/O exception of some sort has occurred
*/
@@ -199,7 +199,7 @@
/**
* Start a new page. When processing has finished on the current page, the
* {@link #endPage()}method must be invoked to mark the page ending.
- *
+ *
* @param pageWidth
* the width of the page
* @param pageHeight
@@ -228,7 +228,7 @@
* Start a new overlay. When processing has finished on the current overlay,
* the {@link #endOverlay()}method must be invoked to mark the overlay
* ending.
- *
+ *
* @param overlayX
* the x position of the overlay on the page
* @param overlayY
@@ -274,7 +274,7 @@
/**
* Helper method to save the current page.
- *
+ *
* @return current page object that was saved
*/
public PageObject savePage() {
@@ -293,7 +293,7 @@
/**
* Helper method to restore the current page.
- *
+ *
* @param pageObject
* page object
*/
@@ -306,7 +306,7 @@
/**
* Helper method to mark the end of the current page.
- *
+ *
* @throws java.io.IOException
* thrown when an I/O exception of some sort has occurred
*/
@@ -327,7 +327,7 @@
/**
* Sets the offsets to be used for element positioning
- *
+ *
* @param xOff
* the offset in the x direction
* @param yOff
@@ -345,7 +345,7 @@
* Helper method to create a map coded font object on the current page, this
* method delegates the construction of the map coded font object to the
* active environment group on the current page.
- *
+ *
* @param fontReference
* the font number used as the resource identifier
* @param font
@@ -362,7 +362,7 @@
/**
* Helper method to create text on the current page, this method delegates
* to the current presentation text object in order to construct the text.
- *
+ *
* @param fontNumber
* the font number used as the resource identifier
* @param x
@@ -388,7 +388,7 @@
/**
* Returns an ImageObject used to create an image in the datastream.
- *
+ *
* @param x
* the x position of the image
* @param y
@@ -455,7 +455,7 @@
/**
* Method to create a line on the current page.
- *
+ *
* @param x1
* the first x coordinate of the line
* @param y1
@@ -481,7 +481,7 @@
* This method will create shading on the page using the specified
* coordinates (the shading contrast is controlled via the red, green, blue
* parameters, by converting this to grey scale).
- *
+ *
* @param x
* the x coordinate of the shading
* @param y
@@ -508,7 +508,7 @@
/**
* Helper method which allows creation of the MPO object, via the AEG. And
* the IPO via the Page. (See actual object for descriptions.)
- *
+ *
* @param name
* the name of the static overlay
*/
@@ -523,7 +523,7 @@
/**
* Helper method which allows creation of the IMM object.
- *
+ *
* @param name
* the name of the medium map
*/
@@ -538,7 +538,7 @@
/**
* Creates an IncludePageSegment on the current page.
- *
+ *
* @param name
* the name of the include page segment
* @param x
@@ -574,7 +574,7 @@
/**
* Creates a TagLogicalElement on the current page.
- *
+ *
* @param attributes
* the array of key value pairs.
*/
@@ -590,7 +590,7 @@
/**
* Creates a TagLogicalElement on the current page group.
- *
+ *
* @param attributes
* the array of key value pairs.
*/
@@ -607,7 +607,7 @@
/**
* Creates a TagLogicalElement on the current page or page group
- *
+ *
* @param name
* The tag name
* @param value
@@ -625,7 +625,7 @@
/**
* Creates a NoOperation item
- *
+ *
* @param content
* byte data
*/
@@ -663,7 +663,7 @@
/**
* Sets the rotation to be used for portrait pages, valid values are 0
* (default), 90, 180, 270.
- *
+ *
* @param pageRotation
* The rotation in degrees.
*/
@@ -682,7 +682,7 @@
/**
* Sets the rotation to be used for landscape pages, valid values are 0, 90,
* 180, 270 (default).
- *
+ *
* @param pageRotation
* The rotation in degrees.
*/
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/AbstractDescriptor.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/AbstractDescriptor.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/AbstractDescriptor.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/AbstractDescriptor.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/AbstractNamedAFPObject.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/AbstractNamedAFPObject.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/AbstractNamedAFPObject.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/AbstractNamedAFPObject.java Thu Jul 24 02:35:34 2008
@@ -25,24 +25,24 @@
* A named data stream object has an 8 byte EBCIDIC name.
*/
public abstract class AbstractNamedAFPObject extends AbstractAFPObject {
-
+
/**
* The actual name of the object
*/
protected String name = null;
-
+
/**
* The name of the object in EBCIDIC bytes
*/
protected byte[] nameBytes;
-
+
/**
* Constructor for the ActiveEnvironmentGroup, this takes a
* name parameter which should be 8 characters long.
* @param name the object name
*/
public AbstractNamedAFPObject(String name) {
-
+
this.name = name;
if (name.length() < 8) {
name = (name + " ").substring(0, 8);
@@ -50,20 +50,20 @@
log.warn("Constructor:: name truncated to 8 chars" + name);
name = name.substring(0, 8);
}
-
+
try {
-
+
nameBytes = name.getBytes(AFPConstants.EBCIDIC_ENCODING);
-
+
} catch (UnsupportedEncodingException usee) {
-
+
nameBytes = name.getBytes();
log.warn(
"Constructor:: UnsupportedEncodingException translating the name "
+ name);
-
+
}
-
+
}
-
+
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/MapCodedFont.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/MapCodedFont.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/MapCodedFont.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/MapCodedFont.java Thu Jul 24 02:35:34 2008
@@ -75,7 +75,7 @@
// Reserved
baos.write(new byte[] {0x00, 0x00, 0x00});
-
+
Iterator iter = fontList.iterator();
while (iter.hasNext()) {
@@ -260,7 +260,7 @@
throw new FontRuntimeException("Failed to create font "
+ " due to a UnsupportedEncodingException", ex);
- }
+ }
}
/**
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/NoOperation.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/NoOperation.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/NoOperation.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/NoOperation.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -35,47 +35,47 @@
* the data carried by the No Operation structured field in interchange
*/
public class NoOperation extends AbstractAFPObject {
-
+
/** Up to 32759 bytes of data with no architectural definition */
private static final int MAX_DATA_LEN = 32759;
-
+
/**
- * Byte representation of the comment
+ * Byte representation of the comment
*/
private String content;
/**
* Construct a tag logical element with the name and value specified.
- *
+ *
* @param content the content to record
*/
public NoOperation(String content) {
this.content = content;
}
-
+
/**
* Accessor method to obtain the byte array AFP datastream for the
* NoOperation.
- *
+ *
* @param os The outputsteam stream
* @throws java.io.IOException if an I/O exception occurs during processing
*/
public void writeDataStream(OutputStream os) throws IOException {
byte[] contentData = content.getBytes(AFPConstants.EBCIDIC_ENCODING);
int contentLen = contentData.length;
-
+
// packet maximum of 32759 bytes
if (contentLen > MAX_DATA_LEN) {
contentLen = MAX_DATA_LEN;
}
-
+
byte[] data = new byte[9 + contentLen];
-
+
data[0] = 0x5A;
-
+
// Set the total record length
byte[] rl1 = BinaryUtils.convert(8 + contentLen, 2);
-
+
//Ignore first byte
data[1] = rl1[0];
data[2] = rl1[1];
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/ObjectAreaDescriptor.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/ObjectAreaDescriptor.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/ObjectAreaDescriptor.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/ObjectAreaDescriptor.java Thu Jul 24 02:35:34 2008
@@ -51,7 +51,7 @@
throws IOException {
byte[] data = new byte[29];
- data[0] = 0x5A;
+ data[0] = 0x5A;
byte[] len = BinaryUtils.convert(data.length - 1, 2);
data[1] = len[0]; // Length
@@ -70,7 +70,7 @@
data[13] = 0x4B; // tid = Measurement Units Triplet
data[14] = 0x00; // XaoBase = 10 inches
data[15] = 0x00; // YaoBase = 10 inches
-
+
// XaoUnits
byte[] xdpi = BinaryUtils.convert(widthResolution * 10, 2);
data[16] = xdpi[0];
@@ -80,7 +80,7 @@
byte[] ydpi = BinaryUtils.convert(heightResolution * 10, 2);
data[18] = ydpi[0];
data[19] = ydpi[1];
-
+
data[20] = 0x09; // Triplet length
data[21] = 0x4C; // tid = Object Area Size
data[22] = 0x02; // Size Type
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/Overlay.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/Overlay.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/Overlay.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/Overlay.java Thu Jul 24 02:35:34 2008
@@ -24,7 +24,7 @@
/**
* An overlay is a MO:DCA-P resource object.
- *
+ *
* It may be stored in an external resource library or it may be
* carried in a resource group. An overlay is similar to a page in
* that it defines its own environment and carries the same data objects.
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/PageDescriptor.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/PageDescriptor.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/PageDescriptor.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/PageDescriptor.java Thu Jul 24 02:35:34 2008
@@ -59,14 +59,14 @@
data[3] = (byte) 0xD3;
data[4] = (byte) 0xA6;
data[5] = (byte) 0xAF;
-
- data[6] = 0x00; // Flags
- data[7] = 0x00; // Reserved
+
+ data[6] = 0x00; // Flags
+ data[7] = 0x00; // Reserved
data[8] = 0x00; // Reserved
-
- data[9] = 0x00; // XpgBase = 10 inches
- data[10] = 0x00; // YpgBase = 10 inches
-
+
+ data[9] = 0x00; // XpgBase = 10 inches
+ data[10] = 0x00; // YpgBase = 10 inches
+
// XpgUnits
byte[] xdpi = BinaryUtils.convert(widthResolution * 10, 2);
data[11] = xdpi[0];
@@ -76,7 +76,7 @@
byte[] ydpi = BinaryUtils.convert(heightResolution * 10, 2);
data[13] = ydpi[0];
data[14] = ydpi[1];
-
+
// XpgSize
byte[] x = BinaryUtils.convert(width, 3);
data[15] = x[0];
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/tools/BinaryUtils.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/tools/BinaryUtils.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/tools/BinaryUtils.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/tools/BinaryUtils.java Thu Jul 24 02:35:34 2008
@@ -50,7 +50,7 @@
size++;
}
}
- return convert(buf.toString());
+ return convert(buf.toString());
}
/**
@@ -92,7 +92,7 @@
} else {
throw new IllegalArgumentException("Bad hexadecimal digit");
}
-
+
if ((c2 >= '0') && (c2 <= '9')) {
b += (c2 - '0');
} else if ((c2 >= 'a') && (c2 <= 'f')) {
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/tools/StructuredFieldReader.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/tools/StructuredFieldReader.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/tools/StructuredFieldReader.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/tools/StructuredFieldReader.java Thu Jul 24 02:35:34 2008
@@ -110,7 +110,7 @@
length[0] = bufferData[b];
length[1] = bufferData[a];
- int reclength = ((length[0] & 0xFF) << 8)
+ int reclength = ((length[0] & 0xFF) << 8)
+ (length[1] & 0xFF) - identifier.length - 2;
byte[] retval = new byte[reclength];
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/awt/AWTRenderer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/awt/AWTRenderer.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/awt/AWTRenderer.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/awt/AWTRenderer.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -67,17 +67,17 @@
private boolean previewAsMainWindow;
/**
- * Renderable instance that can be used to reload and re-render a document after
+ * Renderable instance that can be used to reload and re-render a document after
* modifications.
*/
protected Renderable renderable;
/**
- * Will be notified when rendering progresses
+ * Will be notified when rendering progresses
*/
protected StatusListener statusListener = null;
-
+
/**
* Creates a new AWTRenderer instance.
*/
@@ -98,7 +98,7 @@
public void setUserAgent(FOUserAgent foUserAgent) {
super.setUserAgent(foUserAgent);
if (dialogDisplay) {
- setStatusListener(PreviewDialog.createPreviewDialog(userAgent, this.renderable,
+ setStatusListener(PreviewDialog.createPreviewDialog(userAgent, this.renderable,
this.previewAsMainWindow));
}
}
@@ -111,7 +111,7 @@
public void setRenderable(Renderable renderable) {
this.renderable = renderable;
}
-
+
/**
* Sets whether the preview dialog should be created and displayed when
* the rendering is finished.
@@ -121,7 +121,7 @@
dialogDisplay = show;
}
- /**
+ /**
* {@inheritDoc}
*/
public void renderPage(PageViewport pageViewport) throws IOException {
@@ -149,10 +149,10 @@
Rectangle2D bounds = getPageViewport(pageNum).getViewArea();
pageWidth = (int) Math.round(bounds.getWidth() / 1000f);
pageHeight = (int) Math.round(bounds.getHeight() / 1000f);
- double scaleX = scaleFactor
+ double scaleX = scaleFactor
* (25.4 / FopFactoryConfigurator.DEFAULT_TARGET_RESOLUTION)
/ userAgent.getTargetPixelUnitToMillimeter();
- double scaleY = scaleFactor
+ double scaleY = scaleFactor
* (25.4 / FopFactoryConfigurator.DEFAULT_TARGET_RESOLUTION)
/ userAgent.getTargetPixelUnitToMillimeter();
int bitmapWidth = (int) ((pageWidth * scaleX) + 0.5);
@@ -167,15 +167,15 @@
if (pageIndex >= getNumberOfPages()) {
return null;
}
-
+
PageFormat pageFormat = new PageFormat();
-
+
Paper paper = new Paper();
-
+
Rectangle2D dim = getPageViewport(pageIndex).getViewArea();
double width = dim.getWidth();
double height = dim.getHeight();
-
+
// if the width is greater than the height assume lanscape mode
// and swap the width and height values in the paper format
if (width > height) {
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/awt/AWTRendererMaker.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/awt/AWTRendererMaker.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/awt/AWTRendererMaker.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/awt/AWTRendererMaker.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -30,8 +30,8 @@
public class AWTRendererMaker extends AbstractRendererMaker {
private static final String[] MIMES = new String[] {MimeConstants.MIME_FOP_AWT_PREVIEW};
-
-
+
+
/** {@inheritDoc} */
public Renderer makeRenderer(FOUserAgent ua) {
return new AWTRenderer();
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/awt/viewer/Command.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/awt/viewer/Command.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/awt/viewer/Command.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/awt/viewer/Command.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,7 +16,7 @@
*/
/* $Id$ */
-
+
package org.apache.fop.render.awt.viewer;
//Java
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/awt/viewer/GoToPageDialog.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/awt/viewer/GoToPageDialog.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/awt/viewer/GoToPageDialog.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/awt/viewer/GoToPageDialog.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,7 +16,7 @@
*/
/* $Id$ */
-
+
package org.apache.fop.render.awt.viewer;
import java.awt.Dimension;
@@ -42,7 +42,7 @@
* Stanislav Gorkhover: Stanislav.Gorkhover@jCatalog.com
*/
public class GoToPageDialog extends JDialog {
-
+
private JTextField pageNumberField;
private int pageNumber = -1;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/awt/viewer/ImageProxyPanel.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/awt/viewer/ImageProxyPanel.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/awt/viewer/ImageProxyPanel.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/awt/viewer/ImageProxyPanel.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -129,7 +129,7 @@
int x = (getWidth() - image.getWidth()) / 2;
int y = (getHeight() - image.getHeight()) / 2;
-
+
graphics.drawImage(image, x, y, image.getWidth(), image.getHeight(), null);
} catch (FOPException fopEx) {
fopEx.printStackTrace();
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/awt/viewer/PreviewDialog.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/awt/viewer/PreviewDialog.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/awt/viewer/PreviewDialog.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/awt/viewer/PreviewDialog.java Thu Jul 24 02:35:34 2008
@@ -77,7 +77,7 @@
/** The FOUserAgent associated with this window */
protected FOUserAgent foUserAgent;
/**
- * Renderable instance that can be used to reload and re-render a document after
+ * Renderable instance that can be used to reload and re-render a document after
* modifications.
*/
protected Renderable renderable;
@@ -253,14 +253,14 @@
new Insets(0, 0, 0, 0), 0, 0));
getContentPane().add(statusBar, BorderLayout.SOUTH);
}
-
+
/**
- * Creates and initialize the AWT Viewer main window.
+ * Creates and initialize the AWT Viewer main window.
* @param foUserAgent the FO user agent
* @param renderable the target for the rendering
* @return the newly initialized preview dialog
*/
- public static PreviewDialog createPreviewDialog(FOUserAgent foUserAgent,
+ public static PreviewDialog createPreviewDialog(FOUserAgent foUserAgent,
Renderable renderable, boolean asMainWindow) {
PreviewDialog frame = new PreviewDialog(foUserAgent, renderable);
@@ -295,7 +295,7 @@
public PreviewDialog(FOUserAgent foUserAgent) {
this(foUserAgent, null);
}
-
+
/**
* Creates a new menubar to be shown in this window.
* @return the newly created menubar
@@ -454,7 +454,7 @@
setStatus(translator.getString("Status.Show"));
previewPanel.reload();
}
-
+
/**
* Changes the current visible page
* @param number the page number to go to
@@ -541,7 +541,7 @@
fopEx.printStackTrace();
}
}
-
+
public void setScaleToFitWidth() {
try {
setScale(previewPanel.getScaleToFitWidth() * 100);
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/awt/viewer/PreviewPanel.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/awt/viewer/PreviewPanel.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/awt/viewer/PreviewPanel.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/awt/viewer/PreviewPanel.java Thu Jul 24 02:35:34 2008
@@ -51,7 +51,7 @@
* <p>Use PreviewPanel when you want to embed a preview in your own application
* with your own controls. Use PreviewDialog when you want to use the standard
* Fop controls.
- * </p>
+ * </p>
* <p>In order to embed a PreviewPanel in your own app, create your own renderer,
* and your own agent. In order to support reloads, you may also implement your
* own Renderable extension or the default InputHandler. Setting the Renderable
@@ -109,7 +109,7 @@
/** The FOUserAgent associated with this panel - often shared with PreviewDialog */
protected FOUserAgent foUserAgent;
/**
- * Renderable instance that can be used to reload and re-render a document after
+ * Renderable instance that can be used to reload and re-render a document after
* modifications.
*/
protected Renderable renderable;
@@ -142,7 +142,7 @@
*/
private ViewportScroller scroller;
-
+
/**
* Creates a new PreviewPanel instance.
* @param foUserAgent the user agent
@@ -170,7 +170,7 @@
previewArea.setMinimumSize(new Dimension(50, 50));
add(previewArea);
}
-
+
/**
* @return the currently visible page
*/
@@ -242,12 +242,12 @@
private int startPosX = 0;
/** Starting position of a mouse drag - Y co-ordinate */
private int startPosY = 0;
-
+
ViewportScroller(JViewport vp) {
viewport = vp;
}
- // ***** MouseMotionListener *****
+ // ***** MouseMotionListener *****
public synchronized void mouseDragged(MouseEvent e) {
if (viewport == null) {
@@ -261,7 +261,7 @@
int viewHeight = viewport.getExtentSize().height;
int imageWidth = viewport.getViewSize().width;
int imageHeight = viewport.getViewSize().height;
-
+
Point viewPoint = viewport.getViewPosition();
int viewX = Math.max(0, Math.min(imageWidth - viewWidth, viewPoint.x - xmove));
int viewY = Math.max(0, Math.min(imageHeight - viewHeight, viewPoint.y - ymove));
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/awt/viewer/Renderable.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/awt/viewer/Renderable.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/awt/viewer/Renderable.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/awt/viewer/Renderable.java Thu Jul 24 02:35:34 2008
@@ -35,5 +35,5 @@
*/
void renderTo(FOUserAgent userAgent, String outputFormat)
throws FOPException;
-
+
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/awt/viewer/StatusListener.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/awt/viewer/StatusListener.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/awt/viewer/StatusListener.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/awt/viewer/StatusListener.java Thu Jul 24 02:35:34 2008
@@ -26,9 +26,9 @@
/** Called when a page has been renderered. */
void notifyPageRendered();
-
+
/** Called when the renderer has stopped. */
void notifyRendererStopped();
-
+
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/awt/viewer/Translator.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/awt/viewer/Translator.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/awt/viewer/Translator.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/awt/viewer/Translator.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,7 +16,7 @@
*/
/* $Id$ */
-
+
package org.apache.fop.render.awt.viewer;
//Java
@@ -29,7 +29,7 @@
* Stanislav.Gorkhover@jCatalog.com
*/
public class Translator {
-
+
private ResourceBundle bundle;
private static String bundleBaseName = "org/apache/fop/render/awt/viewer/resources/Viewer";
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/BitmapRendererEventProducer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/BitmapRendererEventProducer.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/BitmapRendererEventProducer.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/BitmapRendererEventProducer.java Thu Jul 24 02:35:34 2008
@@ -33,7 +33,7 @@
/** Provider class for the event producer. */
class Provider {
-
+
/**
* Returns an event producer.
* @param broadcaster the event broadcaster to use
@@ -52,23 +52,23 @@
public EventModel createEventModel() {
return loadModel(getClass(), "event-model.xml");
}
-
+
}
-
+
/**
* No filename information available. Stopping early after the first page.
* @param source the event source
* @event.severity WARN
*/
void stoppingAfterFirstPageNoFilename(Object source);
-
+
/**
* Image writer does not support multiple images. Only the first page has been produced.
* @param source the event source
* @event.severity WARN
*/
void stoppingAfterFirstPageNoMultiWriter(Object source);
-
+
/**
* No ImageWriter found.
* @param source the event source
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/MultiFileRenderingUtil.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/MultiFileRenderingUtil.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/MultiFileRenderingUtil.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/MultiFileRenderingUtil.java Thu Jul 24 02:35:34 2008
@@ -7,7 +7,7 @@
import java.io.OutputStream;
/**
- * This utility class helps renderers who generate one file per page,
+ * This utility class helps renderers who generate one file per page,
* like the PNG renderer.
*/
public class MultiFileRenderingUtil {
@@ -16,10 +16,10 @@
private String filePrefix;
private String fileExtension;
-
+
/** The output directory where images are to be written */
private File outputDir;
-
+
/**
* Creates a new instance.
* <p>
@@ -60,7 +60,7 @@
filePrefix = s.substring(0, i);
}
}
-
+
public OutputStream createOutputStream(int pageNumber) throws IOException {
if (filePrefix == null) {
return null;
@@ -71,5 +71,5 @@
return os;
}
}
-
+
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/PNGRenderer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/PNGRenderer.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/PNGRenderer.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/PNGRenderer.java Thu Jul 24 02:35:34 2008
@@ -48,7 +48,7 @@
/** The OutputStream for the first Image */
private OutputStream firstOutputStream;
-
+
/** Helper class for generating multiple files */
private MultiFileRenderingUtil multiFileUtil;
@@ -60,7 +60,7 @@
/** {@inheritDoc} */
public void startRenderer(OutputStream outputStream) throws IOException {
log.info("rendering areas to PNG");
- multiFileUtil = new MultiFileRenderingUtil(PNG_FILE_EXTENSION,
+ multiFileUtil = new MultiFileRenderingUtil(PNG_FILE_EXTENSION,
getUserAgent().getOutputFile());
this.firstOutputStream = outputStream;
}
@@ -84,7 +84,7 @@
// Do the rendering: get the image for this page
PageViewport pv = (PageViewport)pageViewportList.get(i);
RenderedImage image = (RenderedImage)getPageImage(pv);
-
+
// Encode this image
if (log.isDebugEnabled()) {
log.debug("Encoding page " + (i + 1));
@@ -102,7 +102,7 @@
private void writeImage(OutputStream os, RenderedImage image) throws IOException {
ImageWriterParams params = new ImageWriterParams();
params.setResolution(Math.round(userAgent.getTargetResolution()));
-
+
// Encode PNG image
ImageWriter writer = ImageWriterRegistry.getInstance().getWriterFor(getMimeType());
if (writer == null) {
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/PNGRendererMaker.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/PNGRendererMaker.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/PNGRendererMaker.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/PNGRendererMaker.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -32,8 +32,8 @@
public class PNGRendererMaker extends AbstractRendererMaker {
private static final String[] MIMES = new String[] {MimeConstants.MIME_PNG};
-
-
+
+
/** {@inheritDoc} */
public Renderer makeRenderer(FOUserAgent ua) {
return new PNGRenderer();
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/PNGRenderer_onthefly.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/PNGRenderer_onthefly.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/PNGRenderer_onthefly.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/PNGRenderer_onthefly.java Thu Jul 24 02:35:34 2008
@@ -96,7 +96,7 @@
fileSyntax = s.substring(0, i);
}
- /**
+ /**
* {@inheritDoc}
*/
public void renderPage(PageViewport pageViewport) throws IOException {
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/TIFFRenderer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/TIFFRenderer.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/TIFFRenderer.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/TIFFRenderer.java Thu Jul 24 02:35:34 2008
@@ -80,13 +80,13 @@
//private static final String COMPRESSION_ZLIB = "ZLib";
public static final String COMPRESSION_CCITT_T6 = "CCITT T.6"; //CCITT Group 4
public static final String COMPRESSION_CCITT_T4 = "CCITT T.4"; //CCITT Group 3
-
+
/** ImageWriter parameters */
private ImageWriterParams writerParams;
-
+
/** Image Type as parameter for the BufferedImage constructor (see BufferedImage.TYPE_*) */
private int bufferedImageType = BufferedImage.TYPE_INT_ARGB;
-
+
private OutputStream outputStream;
/** {@inheritDoc} */
@@ -160,7 +160,7 @@
clearViewportList();
log.debug("TIFF encoding done.");
}
-
+
/** {@inheritDoc} */
protected BufferedImage getBufferedImage(int bitmapWidth, int bitmapHeight) {
return new BufferedImage(bitmapWidth, bitmapHeight, bufferedImageType);
@@ -210,7 +210,7 @@
//Decorate the image with a packed sample model for encoding by the codec
SinglePixelPackedSampleModel sppsm;
sppsm = (SinglePixelPackedSampleModel)pageImage.getSampleModel();
-
+
int bands = sppsm.getNumBands();
int[] off = new int[bands];
int w = pageImage.getWidth();
@@ -220,7 +220,7 @@
}
SampleModel sm = new PixelInterleavedSampleModel(
DataBuffer.TYPE_BYTE, w, h, bands, w * bands, off);
-
+
RenderedImage rimg = new FormatRed(GraphicsUtil.wrap(pageImage), sm);
return rimg;
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/TIFFRendererConfigurator.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/TIFFRendererConfigurator.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/TIFFRendererConfigurator.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/TIFFRendererConfigurator.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -28,7 +28,7 @@
import org.apache.fop.render.Renderer;
/**
- * TIFF Renderer configurator
+ * TIFF Renderer configurator
*/
public class TIFFRendererConfigurator extends PrintRendererConfigurator {
@@ -47,7 +47,7 @@
* @throws FOPException fop exception
* {@inheritDoc}
*/
- public void configure(Renderer renderer) throws FOPException {
+ public void configure(Renderer renderer) throws FOPException {
Configuration cfg = super.getRendererConfig(renderer);
if (cfg != null) {
TIFFRenderer tiffRenderer = (TIFFRenderer)renderer;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/TIFFRendererMaker.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/TIFFRendererMaker.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/TIFFRendererMaker.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/TIFFRendererMaker.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -31,7 +31,7 @@
public class TIFFRendererMaker extends AbstractRendererMaker {
private static final String[] MIMES = new String[] {MimeConstants.MIME_TIFF};
-
+
/** {@inheritDoc} */
public Renderer makeRenderer(FOUserAgent userAgent) {
return new TIFFRenderer();
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Base14FontCollection.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Base14FontCollection.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Base14FontCollection.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Base14FontCollection.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/CustomFontMetricsMapper.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/CustomFontMetricsMapper.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/CustomFontMetricsMapper.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/CustomFontMetricsMapper.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/FontMetricsMapper.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/FontMetricsMapper.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/FontMetricsMapper.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/FontMetricsMapper.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -34,5 +34,5 @@
* @return font with the desired characteristics.
*/
java.awt.Font getFont(int size);
-
+
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/InstalledFontCollection.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/InstalledFontCollection.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/InstalledFontCollection.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/InstalledFontCollection.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -61,7 +61,7 @@
/**
* Main constructor
- *
+ *
* @param graphics2D a graphics 2D
*/
public InstalledFontCollection(Graphics2D graphics2D) {
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DFontMetrics.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DFontMetrics.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DFontMetrics.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DFontMetrics.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,7 +16,7 @@
*/
/* $Id$ */
-
+
package org.apache.fop.render.java2d;
// Java
@@ -63,17 +63,17 @@
* The typical height of a small cap latter (often derived from "x", value in mpt)
*/
private int xHeight = 0;
-
+
/**
* The highest point of the font above the baseline (usually derived from "d", value in mpt)
*/
private int ascender = 0;
-
+
/**
* The lowest point of the font under the baseline (usually derived from "p", value in mpt)
*/
private int descender = 0;
-
+
/**
* Buffered font.
* f1 is bufferd for metric measurements during layout.
@@ -103,7 +103,7 @@
/** A LineMetrics to access high-resolution metrics information. */
private LineMetrics lineMetrics;
-
+
/**
* Temp graphics object needed to get the font metrics
*/
@@ -130,7 +130,7 @@
setFont(family, style, size);
return Math.round(lineMetrics.getAscent() * FONT_FACTOR);
}
-
+
/**
* Determines the font ascent of the Font described by this
* FontMetrics object
@@ -159,7 +159,7 @@
* Rectangle FontMetrics.getStringBounds(..) method can be called.
* The y value of the rectangle is the offset from the origin
* (baseline) apparently needed by the sample test program
- *
+ *
* xxxxx@xxxxx 2001-05-15
*/
/* I don't think this is right.
@@ -231,7 +231,7 @@
Rectangle2D rect = fmt.getStringBounds(ch, 0, 1, this.graphics);
return (int)Math.round(rect.getWidth() * 1000);
}
-
+
/**
* Return widths (in 1/1000ths of point size) of all
* characters
@@ -265,7 +265,7 @@
atts.put(TextAttribute.SIZE, new Float(size)); //size in pt
return new Font(atts);
}
-
+
/**
* Checks whether the font for which values are
* requested is the one used immediately before or
@@ -301,17 +301,17 @@
TextLayout layout = new TextLayout("x", f1, graphics.getFontRenderContext());
Rectangle2D rect = layout.getBounds();
xHeight = (int)Math.round(-rect.getY() * 1000);
-
+
//PostScript-compatible ascent
layout = new TextLayout("d", f1, graphics.getFontRenderContext());
rect = layout.getBounds();
ascender = (int)Math.round(-rect.getY() * 1000);
-
+
//PostScript-compatible descent
layout = new TextLayout("p", f1, graphics.getFontRenderContext());
rect = layout.getBounds();
descender = (int)Math.round((rect.getY() + rect.getHeight()) * -1000);
-
+
//Alternative way to get metrics but the ascender is again wrong for our purposes
lineMetrics = f1.getLineMetrics("", graphics.getFontRenderContext());
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DGraphics2DAdapter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DGraphics2DAdapter.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DGraphics2DAdapter.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DGraphics2DAdapter.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,7 +16,7 @@
*/
/* $Id$ */
-
+
package org.apache.fop.render.java2d;
import java.awt.Color;
@@ -40,12 +40,12 @@
public void paintImage(Graphics2DImagePainter painter,
RendererContext context,
int x, int y, int width, int height) throws IOException {
-
+
float fwidth = width / 1000f;
float fheight = height / 1000f;
float fx = x / 1000f;
float fy = y / 1000f;
-
+
// get the 'width' and 'height' attributes of the SVG document
Dimension dim = painter.getImageSize();
float imw = (float)dim.getWidth() / 1000f;
@@ -56,12 +56,12 @@
Java2DRenderer renderer = (Java2DRenderer)context.getRenderer();
Java2DGraphicsState state = renderer.state;
-
+
//Create copy and paint on that
Graphics2D g2d = (Graphics2D)state.getGraph().create();
g2d.setColor(Color.black);
g2d.setBackground(Color.black);
-
+
//TODO Clip to the image area.
// transform so that the coordinates (0,0) is from the top left
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DGraphicsState.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DGraphicsState.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DGraphicsState.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DGraphicsState.java Thu Jul 24 02:35:34 2008
@@ -73,14 +73,14 @@
* @param org the instance to copy
*/
public Java2DGraphicsState(Java2DGraphicsState org) {
- this.currentGraphics = (Graphics2D)org.currentGraphics.create();
+ this.currentGraphics = (Graphics2D)org.currentGraphics.create();
this.fontInfo = org.fontInfo;
this.initialTransform = org.initialTransform;
this.currentStroke = org.currentStroke;
this.currentStrokeStyle = org.currentStrokeStyle;
this.currentStrokeWidth = org.currentStrokeWidth;
}
-
+
/**
* @return the currently valid state
*/
@@ -92,7 +92,7 @@
public void dispose() {
this.currentGraphics.dispose();
this.currentGraphics = null;
-
+
}
/**
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DRendererConfigurator.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DRendererConfigurator.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DRendererConfigurator.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DRendererConfigurator.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DRendererContextConstants.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DRendererContextConstants.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DRendererContextConstants.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DRendererContextConstants.java Thu Jul 24 02:35:34 2008
@@ -29,5 +29,5 @@
/** The current Java2DGraphicsState. */
String JAVA2D_STATE = "state";
-
+
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DSVGHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DSVGHandler.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DSVGHandler.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DSVGHandler.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -94,7 +94,7 @@
+ "currentYPosition = " + currentYPosition + "}";
}
}
-
+
/** {@inheritDoc} */
protected void renderSVGDocument(RendererContext context,
Document doc) {
@@ -105,12 +105,12 @@
int x = info.currentXPosition;
int y = info.currentYPosition;
-
+
SVGUserAgent ua = new SVGUserAgent(context.getUserAgent(), new AffineTransform());
-
+
GVTBuilder builder = new GVTBuilder();
BridgeContext ctx = new BridgeContext(ua);
-
+
GraphicsNode root;
try {
root = builder.build(ctx, doc);
@@ -120,20 +120,20 @@
eventProducer.svgNotBuilt(this, e, getDocumentURI(doc));
return;
}
-
+
// If no viewbox is defined in the svg file, a viewbox of 100x100 is
// assumed, as defined in SVGUserAgent.getViewportSize()
float iw = (float) ctx.getDocumentSize().getWidth() * 1000f;
float ih = (float) ctx.getDocumentSize().getHeight() * 1000f;
-
+
float w = (float) info.width;
float h = (float) info.height;
AffineTransform origTransform = info.state.getGraph().getTransform();
-
+
// correct integer roundoff
info.state.getGraph().translate(x / 1000f, y / 1000f);
-
+
//SVGSVGElement svg = ((SVGDocument) doc).getRootElement();
// Aspect ratio preserved by layout engine, not here
AffineTransform at = AffineTransform.getScaleInstance(w / iw, h / ih);
@@ -148,10 +148,10 @@
context.getUserAgent().getEventBroadcaster());
eventProducer.svgRenderingError(this, e, getDocumentURI(doc));
}
-
+
info.state.getGraph().setTransform(origTransform);
}
-
+
/** {@inheritDoc} */
public boolean supportsRenderer(Renderer renderer) {
return (renderer instanceof Java2DRenderer);
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/SystemFontMetricsMapper.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/SystemFontMetricsMapper.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/SystemFontMetricsMapper.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/SystemFontMetricsMapper.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,7 +16,7 @@
*/
/* $Id$ */
-
+
package org.apache.fop.render.java2d;
// Java
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/DefaultMonochromeBitmapConverter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/DefaultMonochromeBitmapConverter.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/DefaultMonochromeBitmapConverter.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/DefaultMonochromeBitmapConverter.java Thu Jul 24 02:35:34 2008
@@ -36,10 +36,10 @@
public void setHint(String name, String value) {
//ignore, not supported
}
-
+
/** {@inheritDoc} */
public RenderedImage convertToMonochrome(BufferedImage img) {
- BufferedImage buf = new BufferedImage(img.getWidth(), img.getHeight(),
+ BufferedImage buf = new BufferedImage(img.getWidth(), img.getHeight(),
BufferedImage.TYPE_BYTE_BINARY);
RenderingHints hints = new RenderingHints(null);
//This hint doesn't seem to make a difference :-(
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/JAIMonochromeBitmapConverter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/JAIMonochromeBitmapConverter.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/JAIMonochromeBitmapConverter.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/JAIMonochromeBitmapConverter.java Thu Jul 24 02:35:34 2008
@@ -46,20 +46,20 @@
MonochromeBitmapConverter {
private boolean isErrorDiffusion = false;
-
+
/** {@inheritDoc} */
public void setHint(String name, String value) {
if ("quality".equalsIgnoreCase(name)) {
isErrorDiffusion = "true".equalsIgnoreCase(value);
}
}
-
+
/** {@inheritDoc} */
public RenderedImage convertToMonochrome(BufferedImage img) {
if (img.getColorModel().getColorSpace().getNumComponents() != 1) {
throw new IllegalArgumentException("Source image must be a grayscale image!");
}
-
+
// Load the ParameterBlock for the dithering operation
// and set the operation name.
ParameterBlock pb = new ParameterBlock();
@@ -78,7 +78,7 @@
pb.add(colorMap);
pb.add(KernelJAI.DITHER_MASK_441);
}
-
+
//Create an image layout for a monochrome b/w image
ImageLayout layout = new ImageLayout();
byte[] map = new byte[] {(byte)0x00, (byte)0xff};
@@ -89,8 +89,8 @@
RenderingHints hints = new RenderingHints(JAI.KEY_IMAGE_LAYOUT, layout);
// Dither the image.
- PlanarImage dst = JAI.create(opName, pb, hints);
-
+ PlanarImage dst = JAI.create(opName, pb, hints);
+
//Convert it to a BufferedImage
return dst.getAsBufferedImage();
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/MonochromeBitmapConverter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/MonochromeBitmapConverter.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/MonochromeBitmapConverter.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/MonochromeBitmapConverter.java Thu Jul 24 02:35:34 2008
@@ -33,12 +33,12 @@
* @param value the value
*/
void setHint(String name, String value);
-
+
/**
- * Converts a grayscale bitmap image to a monochrome (1-bit) b/w bitmap image.
+ * Converts a grayscale bitmap image to a monochrome (1-bit) b/w bitmap image.
* @param img the grayscale image
* @return the converted monochrome image
*/
RenderedImage convertToMonochrome(BufferedImage img);
-
+
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLEventProducer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLEventProducer.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLEventProducer.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLEventProducer.java Thu Jul 24 02:35:34 2008
@@ -31,7 +31,7 @@
/** Provider class for the event producer. */
class Provider {
-
+
/**
* Returns an event producer.
* @param broadcaster the event broadcaster to use
@@ -50,9 +50,9 @@
public EventModel createEventModel() {
return loadModel(getClass(), "event-model.xml");
}
-
+
}
-
+
/**
* Paper type could not be determined. Falling back to another.
* @param source the event source
@@ -62,5 +62,5 @@
* @event.severity WARN
*/
void paperTypeUnavailable(Object source, long pageWidth, long pageHeight, String fallbackPaper);
-
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org