some preliminary changes to image handling

Images are put into a cache, different cahces are possible
if information is required it needs to be explicitly loaded


git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@194663 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 3 insertions, 8 deletions

diff --git a/src/org/apache/fop/pdf/PDFXObject.java b/src/org/apache/fop/pdf/PDFXObject.java
index 35754b739..6b97e43c7 100644
--- a/src/org/apache/fop/pdf/PDFXObject.java
+++ b/src/org/apache/fop/pdf/PDFXObject.java
@@ -21,7 +21,6 @@ import org.apache.fop.pdf.PDFICCStream;
 import org.apache.fop.image.FopImage;
 import org.apache.fop.image.EPSImage;
 import org.apache.fop.image.JpegImage;
-import org.apache.fop.image.FopImageException;
 
 /**
  * PDF XObject
@@ -50,8 +49,9 @@ public class PDFXObject extends PDFObject {
         super(number);
         isPS = false;
         this.Xnum = Xnumber;
-        if (img == null)
+        if (img == null) {
             //log.error("FISH");
+        }
         fopimage = img;
         this.pdfDoc = pdfdoc;
         pdfICCStream = null;
@@ -142,8 +142,6 @@ public class PDFXObject extends PDFObject {
                 p = p + "/Subtype /PS\n";
                 p = p + "/Length " + imgStream.getDataLength();
                 
-	            // don't know if it's the good place (other objects can have references to it)
-                fopimage.close();
                 p = p + dictEntries;
                 p = p + ">>\n";
                 
@@ -208,9 +206,6 @@ public class PDFXObject extends PDFObject {
                 p = p + dictEntries;
                 p = p + ">>\n";
                 
-	            // don't know if it's the good place (other objects can have references to it)
-                fopimage.close();
-                
 	            // push the pdf dictionary on the writer
                 byte[] pdfBytes = p.getBytes();
                 stream.write(pdfBytes);
@@ -222,7 +217,7 @@ public class PDFXObject extends PDFObject {
                 stream.write(pdfBytes);
                 length += pdfBytes.length;
             }
-        } catch (FopImageException imgex) {
+        } catch (Exception imgex) {
             //log.error("Error in XObject : "
             //                       + imgex.getMessage());
         }