chrisg 02/02/17 15:14:10
Modified: src/org/apache/fop/image Tag: fop-0_20_2-maintain
FopImageConsumer.java
src/org/apache/fop/pdf Tag: fop-0_20_2-maintain
PDFDocument.java
Log:
Merged two bugfixes from main branch:
fix in makePDFICCStream (Tore Engvig)
fix to prevent fop hanging with animated gifs
Submitted by: "Beer, Christian" <[EMAIL PROTECTED]>
Revision Changes Path
No revision
No revision
1.3.2.1 +5 -3 xml-fop/src/org/apache/fop/image/FopImageConsumer.java
Index: FopImageConsumer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/image/FopImageConsumer.java,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- FopImageConsumer.java 30 Jul 2001 20:29:26 -0000 1.3
+++ FopImageConsumer.java 17 Feb 2002 23:14:10 -0000 1.3.2.1
@@ -1,5 +1,5 @@
/*
- * $Id: FopImageConsumer.java,v 1.3 2001/07/30 20:29:26 tore Exp $
+ * $Id: FopImageConsumer.java,v 1.3.2.1 2002/02/17 23:14:10 chrisg Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -57,7 +57,8 @@
*/
synchronized (this.imageStatus) {
// Need to stop status if image done
- if (this.imageStatus.intValue() != ImageConsumer.STATICIMAGEDONE)
+ if (imageStatus.intValue() != ImageConsumer.STATICIMAGEDONE
+ && imageStatus.intValue() != ImageConsumer.SINGLEFRAMEDONE)
this.imageStatus = new Integer(status);
}
}
@@ -96,7 +97,8 @@
if (this.imageStatus.intValue() == ImageConsumer.IMAGEERROR)
throw new Exception("Image error");
- if (this.imageStatus.intValue() == ImageConsumer.STATICIMAGEDONE)
+ if (imageStatus.intValue() == ImageConsumer.STATICIMAGEDONE
+ || imageStatus.intValue() == ImageConsumer.SINGLEFRAMEDONE)
return true;
return false;
No revision
No revision
1.30.2.2 +2 -2 xml-fop/src/org/apache/fop/pdf/PDFDocument.java
Index: PDFDocument.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/pdf/PDFDocument.java,v
retrieving revision 1.30.2.1
retrieving revision 1.30.2.2
diff -u -r1.30.2.1 -r1.30.2.2
--- PDFDocument.java 2 Dec 2001 22:17:29 -0000 1.30.2.1
+++ PDFDocument.java 17 Feb 2002 23:14:10 -0000 1.30.2.2
@@ -1,5 +1,5 @@
/*
- * $Id: PDFDocument.java,v 1.30.2.1 2001/12/02 22:17:29 tore Exp $
+ * $Id: PDFDocument.java,v 1.30.2.2 2002/02/17 23:14:10 chrisg Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -763,7 +763,7 @@
public PDFICCStream makePDFICCStream() {
PDFICCStream iccStream = new PDFICCStream(++this.objectcount);
- this.objects.addElement(iccStream);
+ this.objects.add(iccStream);
return iccStream;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
