Attached is the diff for the patch. This is going against the latest release
build. When reading the diff "G:\Fop-0.20.1\Fop-0.20.1-clean" is the
untouched distribution "G:\Fop-0.20.1\Fop-0.20.1-dev" is the modified
distribution. It should work y just copying over the attached files and then
deleting src/org/apache/image/GifJpegImage.java since it will not be in use.
If I need to follow this up in any way I'll try my best to help. I hope one
of the commiters can look at this and deem it worthy to patch FOP.

-Eric B Dalquist
diff -r -H 
G:\Fop-0.20.1\Fop-0.20.1-clean\src\org\apache\fop\image\AbstractFopImage.java 
G:\Fop-0.20.1\Fop-0.20.1-dev\src\org\apache\fop\image\AbstractFopImage.java
23a24
>  * @author Modified by Eric Dalquist - 9/14/2001 - [EMAIL PROTECTED]
78a80,87
>      * Image compression type.
>      *
>      * Added by Eric Dalquist
>      */
>     protected PDFFilter m_compressionType = null;
> 
> 
>     /**
253c262,272
<         return null;
---
>               /*
>                * Added by Eric Dalquist
>                *
>                * Using the bitsPerPixel var as our flag since many imges will
>                * have a null m_compressionType even after being loaded
>                */
> 
>               if (this.m_bitsPerPixel == 0)
>                       this.loadImage();
> 
>               return m_compressionType;
diff -r -H 
G:\Fop-0.20.1\Fop-0.20.1-clean\src\org\apache\fop\image\FopImageFactory.java 
G:\Fop-0.20.1\Fop-0.20.1-dev\src\org\apache\fop\image\FopImageFactory.java
27a28
>  * @author Modified by Eric Dalquist - 9/14/2001 - [EMAIL PROTECTED]
100a102,107
> 
>         /*
>          * Modified by: Eric Dalquist
>          * Changed the Jpeg and Gif imageClassNames to the new image classes
>          */
> 
102c109
<             imgClassName = "org.apache.fop.image.GifJpegImage";
---
>             imgClassName = "org.apache.fop.image.GifImage";
105c112
<             imgClassName = "org.apache.fop.image.GifJpegImage";
---
>             imgClassName = "org.apache.fop.image.JpegImage";
Only in G:\Fop-0.20.1\Fop-0.20.1-dev\src\org\apache\fop\image: GifImage.java
Only in G:\Fop-0.20.1\Fop-0.20.1-clean\src\org\apache\fop\image: GifJpegImage.java
Only in G:\Fop-0.20.1\Fop-0.20.1-dev\src\org\apache\fop\image: JpegImage.java
Only in G:\Fop-0.20.1\Fop-0.20.1-dev\src\org\apache\fop\pdf: DCTFilter.java
diff -r -H G:\Fop-0.20.1\Fop-0.20.1-clean\src\org\apache\fop\pdf\PDFXObject.java 
G:\Fop-0.20.1\Fop-0.20.1-dev\src\org\apache\fop\pdf\PDFXObject.java
68c68,77
<             // imgStream.addFilter(new FlateFilter());
---
> 
>                       /*
>                        * Added by Eric Dalquist
>                        *
>                        * If the DCT filter hasn't been added to the object we add it 
>here
>                        */
>             if (fopimage.getPDFFilter() != null) {
>                               imgStream.addFilter(fopimage.getPDFFilter());
>                       }
> 
77c86
<             p = p + "/Length " + imgStream.getDataLength();
---
>             p = p + "/Length " + imgStream.getDataLength() + "\n";

JpegImage.java

AbstractFopImage.java

FopImageFactory.java

GifImage.java

PDFXObject.java

DCTFilter.java

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]

Reply via email to