pbwest 2004/03/13 00:46:05
Modified: src/java/org/apache/fop/render Tag: FOP_0-20-0_Alt-Design
RendererContext.java AbstractRenderer.java
Renderer.java
src/java/org/apache/fop/render/awt Tag:
FOP_0-20-0_Alt-Design AWTRenderer.java
src/java/org/apache/fop/fonts/truetype Tag:
FOP_0-20-0_Alt-Design TTFFile.java
FontFileReader.java TTFSubSetFile.java
src/java/org/apache/fop/fonts/type1 Tag:
FOP_0-20-0_Alt-Design PFMFile.java
Log:
Tidied up to suppress Eclipse nagging
Revision Changes Path
No revision
No revision
1.3.2.2 +1 -1 xml-fop/src/java/org/apache/fop/render/RendererContext.java
Index: RendererContext.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/RendererContext.java,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- RendererContext.java 10 Mar 2004 06:24:27 -0000 1.3.2.1
+++ RendererContext.java 13 Mar 2004 08:46:05 -0000 1.3.2.2
@@ -22,7 +22,7 @@
import java.util.Map;
//FOP
-import org.apache.fop.apps.FOUserAgent;
+import org.apache.fop.configuration.FOUserAgent;
/**
* The Render Context for external handlers. This provides a rendering context
1.24.2.2 +1 -1 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.24.2.1
retrieving revision 1.24.2.2
diff -u -r1.24.2.1 -r1.24.2.2
--- AbstractRenderer.java 10 Mar 2004 06:24:27 -0000 1.24.2.1
+++ AbstractRenderer.java 13 Mar 2004 08:46:05 -0000 1.24.2.2
@@ -30,8 +30,8 @@
import org.apache.fop.area.CoordTransformer;
import org.apache.fop.area.PageViewport;
import org.apache.fop.area.RegionViewport;
-import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.apps.Fop;
+import org.apache.fop.configuration.FOUserAgent;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
1.8.2.2 +1 -1 xml-fop/src/java/org/apache/fop/render/Renderer.java
Index: Renderer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/Renderer.java,v
retrieving revision 1.8.2.1
retrieving revision 1.8.2.2
diff -u -r1.8.2.1 -r1.8.2.2
--- Renderer.java 10 Mar 2004 06:24:27 -0000 1.8.2.1
+++ Renderer.java 13 Mar 2004 08:46:05 -0000 1.8.2.2
@@ -27,7 +27,7 @@
// FOP
import org.apache.fop.apps.FOPException;
import org.apache.fop.area.PageViewport;
-import org.apache.fop.apps.FOUserAgent;
+import org.apache.fop.configuration.FOUserAgent;
/**
* Interface implemented by all renderers. This interface is used to control
No revision
No revision
1.21.2.2 +0 -4 xml-fop/src/java/org/apache/fop/render/awt/AWTRenderer.java
Index: AWTRenderer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/awt/AWTRenderer.java,v
retrieving revision 1.21.2.1
retrieving revision 1.21.2.2
diff -u -r1.21.2.1 -r1.21.2.2
--- AWTRenderer.java 10 Mar 2004 06:24:28 -0000 1.21.2.1
+++ AWTRenderer.java 13 Mar 2004 08:46:05 -0000 1.21.2.2
@@ -29,13 +29,9 @@
import java.awt.Color;
import java.awt.Dimension;
import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.awt.RenderingHints;
import java.awt.Toolkit;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
-import java.awt.geom.AffineTransform;
-import java.awt.geom.Rectangle2D;
import java.awt.image.BufferedImage;
import java.awt.print.PageFormat;
import java.awt.print.Pageable;
No revision
No revision
1.5.2.2 +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.5.2.1
retrieving revision 1.5.2.2
diff -u -r1.5.2.1 -r1.5.2.2
--- TTFFile.java 10 Mar 2004 06:24:28 -0000 1.5.2.1
+++ TTFFile.java 13 Mar 2004 08:46:05 -0000 1.5.2.2
@@ -380,7 +380,7 @@
ansiIndex = new java.util.HashMap();
for (int i = 32; i < Glyphs.WINANSI_ENCODING.length; i++) {
Integer ansi = new Integer(i);
- Integer uni = new Integer((int)Glyphs.WINANSI_ENCODING[i]);
+ Integer uni = new Integer(Glyphs.WINANSI_ENCODING[i]);
List v = (List)ansiIndex.get(uni);
if (v == null) {
@@ -515,7 +515,7 @@
* @return int The CapHeight
*/
public int getCapHeight() {
- return (int)convertTTFUnit2PDFUnit(capHeight);
+ return convertTTFUnit2PDFUnit(capHeight);
}
/**
@@ -523,7 +523,7 @@
* @return int The XHeight
*/
public int getXHeight() {
- return (int)convertTTFUnit2PDFUnit(xHeight);
+ return convertTTFUnit2PDFUnit(xHeight);
}
/**
@@ -575,10 +575,10 @@
*/
public int[] getFontBBox() {
final int[] fbb = new int[4];
- fbb[0] = (int)convertTTFUnit2PDFUnit(fontBBox1);
- fbb[1] = (int)convertTTFUnit2PDFUnit(fontBBox2);
- fbb[2] = (int)convertTTFUnit2PDFUnit(fontBBox3);
- fbb[3] = (int)convertTTFUnit2PDFUnit(fontBBox4);
+ fbb[0] = convertTTFUnit2PDFUnit(fontBBox1);
+ fbb[1] = convertTTFUnit2PDFUnit(fontBBox2);
+ fbb[2] = convertTTFUnit2PDFUnit(fontBBox3);
+ fbb[3] = convertTTFUnit2PDFUnit(fontBBox4);
return fbb;
}
@@ -588,7 +588,7 @@
* @return int The LowerCaseAscent
*/
public int getLowerCaseAscent() {
- return (int)convertTTFUnit2PDFUnit(ascender);
+ return convertTTFUnit2PDFUnit(ascender);
}
/**
@@ -596,7 +596,7 @@
* @return int The LowerCaseDescent
*/
public int getLowerCaseDescent() {
- return (int)convertTTFUnit2PDFUnit(descender);
+ return convertTTFUnit2PDFUnit(descender);
}
/**
@@ -623,7 +623,7 @@
public int[] getWidths() {
int[] wx = new int[mtxTab.length];
for (int i = 0; i < wx.length; i++) {
- wx[i] = (int)convertTTFUnit2PDFUnit(mtxTab[i].getWx());
+ wx[i] = convertTTFUnit2PDFUnit(mtxTab[i].getWx());
}
return wx;
@@ -635,7 +635,7 @@
* @return int Standard width
*/
public int getCharWidth(int idx) {
- return (int)convertTTFUnit2PDFUnit(ansiWidth[idx]);
+ return convertTTFUnit2PDFUnit(ansiWidth[idx]);
}
/**
@@ -1092,7 +1092,7 @@
adjTab = new java.util.HashMap();
}
adjTab.put(new Integer(j),
- new Integer((int)convertTTFUnit2PDFUnit(kpx)));
+ new Integer(convertTTFUnit2PDFUnit(kpx)));
kerningTab.put(iObj, adjTab);
}
}
@@ -1231,8 +1231,8 @@
System.out.println("Family name: " + familyName);
System.out.println("Subfamily name: " + subFamilyName);
System.out.println("Notice: " + notice);
- System.out.println("xHeight: " + (int)convertTTFUnit2PDFUnit(xHeight));
- System.out.println("capheight: " +
(int)convertTTFUnit2PDFUnit(capHeight));
+ System.out.println("xHeight: " + convertTTFUnit2PDFUnit(xHeight));
+ System.out.println("capheight: " + convertTTFUnit2PDFUnit(capHeight));
int italic = (int)(italicAngle >> 16);
System.out.println("Italic: " + italic);
@@ -1245,10 +1245,10 @@
System.out.println();
System.out.println("Ascender: " + convertTTFUnit2PDFUnit(ascender));
System.out.println("Descender: " + convertTTFUnit2PDFUnit(descender));
- System.out.println("FontBBox: [" + (int)convertTTFUnit2PDFUnit(fontBBox1)
- + " " + (int)convertTTFUnit2PDFUnit(fontBBox2) + " "
- + (int)convertTTFUnit2PDFUnit(fontBBox3) + " "
- + (int)convertTTFUnit2PDFUnit(fontBBox4) + "]");
+ System.out.println("FontBBox: [" + convertTTFUnit2PDFUnit(fontBBox1)
+ + " " + convertTTFUnit2PDFUnit(fontBBox2) + " "
+ + convertTTFUnit2PDFUnit(fontBBox3) + " "
+ + convertTTFUnit2PDFUnit(fontBBox4) + "]");
}
/**
1.4.2.2 +3 -3
xml-fop/src/java/org/apache/fop/fonts/truetype/FontFileReader.java
Index: FontFileReader.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fonts/truetype/FontFileReader.java,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -r1.4.2.1 -r1.4.2.2
--- FontFileReader.java 10 Mar 2004 06:24:28 -0000 1.4.2.1
+++ FontFileReader.java 13 Mar 2004 08:46:05 -0000 1.4.2.2
@@ -161,9 +161,9 @@
final byte buf = read();
if (buf < 0) {
- return (int)(256 + buf);
+ return 256 + buf;
} else {
- return (int)buf;
+ return buf;
}
}
@@ -187,7 +187,7 @@
*/
public final int readTTFUShort() throws IOException {
final int ret = (readTTFUByte() << 8) + readTTFUByte();
- return (int)ret;
+ return ret;
}
/**
1.2.2.2 +12 -17
xml-fop/src/java/org/apache/fop/fonts/truetype/TTFSubSetFile.java
Index: TTFSubSetFile.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fonts/truetype/TTFSubSetFile.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- TTFSubSetFile.java 10 Mar 2004 06:24:28 -0000 1.2.2.1
+++ TTFSubSetFile.java 13 Mar 2004 08:46:05 -0000 1.2.2.2
@@ -198,7 +198,7 @@
/**
* Create an empty loca table without updating checksum
*/
- private void createLoca(int size) throws IOException {
+ private void createLoca(int size) {
pad4();
locaOffset = currentPos;
writeULong(locaDirOffset + 4, currentPos);
@@ -657,12 +657,7 @@
//log.error("TrueType warning: " + ex.getMessage());
}
- try {
- createLoca(glyphs.size()); // create empty loca table
- } catch (IOException ex) {
- // Loca is optional (only required for OpenType (MS) fonts)
- //log.error("TrueType warning: " + ex.getMessage());
- }
+ createLoca(glyphs.size()); // create empty loca table
try {
createGlyf(in, glyphs);
@@ -771,15 +766,15 @@
* Read a unsigned short value at given position
*/
private int readUShort(int pos) {
- int ret = (int)output[pos];
+ int ret = output[pos];
if (ret < 0) {
ret += 256;
}
ret = ret << 8;
- if ((int)output[pos + 1] < 0) {
- ret |= (int)output[pos + 1] + 256;
+ if (output[pos + 1] < 0) {
+ ret |= output[pos + 1] + 256;
} else {
- ret |= (int)output[pos + 1];
+ ret |= output[pos + 1];
}
return ret;
@@ -802,7 +797,7 @@
*/
private int maxPow2(int max) {
int i = 0;
- while (Math.pow(2, (double)i) < max) {
+ while (Math.pow(2, i) < max) {
i++;
}
@@ -810,7 +805,7 @@
}
private int log2(int num) {
- return (int)(Math.log((double)num) / Math.log(2));
+ return (int)(Math.log(num) / Math.log(2));
}
@@ -829,10 +824,10 @@
long sum = 0;
for (int i = 0; i < size; i += 4) {
- int l = (int)(output[start + i] << 24);
- l += (int)(output[start + i + 1] << 16);
- l += (int)(output[start + i + 2] << 16);
- l += (int)(output[start + i + 3] << 16);
+ int l = output[start + i] << 24;
+ l += output[start + i + 1] << 16;
+ l += output[start + i + 2] << 16;
+ l += output[start + i + 3] << 16;
sum += l;
if (sum > 0xffffffff) {
sum = sum - 0xffffffff;
No revision
No revision
1.5.2.2 +2 -2 xml-fop/src/java/org/apache/fop/fonts/type1/PFMFile.java
Index: PFMFile.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fonts/type1/PFMFile.java,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -r1.5.2.1 -r1.5.2.2
--- PFMFile.java 10 Mar 2004 06:24:29 -0000 1.5.2.1
+++ PFMFile.java 13 Mar 2004 08:46:05 -0000 1.5.2.2
@@ -164,10 +164,10 @@
getLogger().info(i + " kerning pairs");
while (i > 0) {
- int g1 = (int)inStream.readByte();
+ int g1 = inStream.readByte();
i--;
- int g2 = (int)inStream.readByte();
+ int g2 = inStream.readByte();
int adj = inStream.readShort();
if (adj > 0x8000) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
