jeremias 2003/03/27 03:04:31
Modified: src/java/org/apache/fop/pdf PDFFactory.java
PDFFontDescriptor.java
Log:
Adjust to the PDFT1Stream being an AbstractPDFStream now.
Revision Changes Path
1.2 +3 -3 xml-fop/src/java/org/apache/fop/pdf/PDFFactory.java
Index: PDFFactory.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/pdf/PDFFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PDFFactory.java 27 Mar 2003 10:24:55 -0000 1.1
+++ PDFFactory.java 27 Mar 2003 11:04:31 -0000 1.2
@@ -1078,7 +1078,7 @@
// Check if the font is embeddable
if (desc.isEmbeddable()) {
- PDFStream stream = makeFontFile(desc);
+ AbstractPDFStream stream = makeFontFile(desc);
if (stream != null) {
descriptor.setFontFile(desc.getFontType(), stream);
getDocument().registerObject(stream);
@@ -1092,7 +1092,7 @@
* @param desc FontDescriptor of the font.
* @return PDFStream The embedded font file
*/
- public PDFStream makeFontFile(FontDescriptor desc) {
+ public AbstractPDFStream makeFontFile(FontDescriptor desc) {
if (desc.getFontType() == FontType.OTHER) {
throw new IllegalArgumentException("Trying to embed unsupported font
type: "
+ desc.getFontType());
@@ -1142,7 +1142,7 @@
return null;
} else {
try {
- PDFStream embeddedFont;
+ AbstractPDFStream embeddedFont;
if (desc.getFontType() == FontType.TYPE0) {
MultiByteFont mbfont = (MultiByteFont)font;
FontFileReader reader = new FontFileReader(in);
1.3 +2 -2 xml-fop/src/java/org/apache/fop/pdf/PDFFontDescriptor.java
Index: PDFFontDescriptor.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/pdf/PDFFontDescriptor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PDFFontDescriptor.java 27 Mar 2003 10:32:22 -0000 1.2
+++ PDFFontDescriptor.java 27 Mar 2003 11:04:31 -0000 1.3
@@ -75,7 +75,7 @@
private int avgWidth = 0;
private int maxWidth = 0;
private int missingWidth = 0;
- private PDFStream fontfile;
+ private AbstractPDFStream fontfile;
// private String charSet = null;
private FontType subtype;
@@ -141,7 +141,7 @@
* @param subtype the font type defined in the font stream
* @param fontfile the stream containing an embedded font
*/
- public void setFontFile(FontType subtype, PDFStream fontfile) {
+ public void setFontFile(FontType subtype, AbstractPDFStream fontfile) {
this.subtype = subtype;
this.fontfile = fontfile;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
