You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ja...@apache.org on 2015/07/09 07:35:23 UTC

svn commit: r1689988 - /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/PDImageXObject.java

Author: jahewson
Date: Thu Jul  9 05:35:23 2015
New Revision: 1689988

URL: http://svn.apache.org/r1689988
Log:
PDFBOX-2323: Use a SoftReference for cached image data

Modified:
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/PDImageXObject.java

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/PDImageXObject.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/PDImageXObject.java?rev=1689988&r1=1689987&r2=1689988&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/PDImageXObject.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/PDImageXObject.java Thu Jul  9 05:35:23 2015
@@ -17,6 +17,7 @@
 package org.apache.pdfbox.pdmodel.graphics.image;
 
 import java.awt.RenderingHints;
+import java.lang.ref.SoftReference;
 import org.apache.pdfbox.cos.COSArray;
 import org.apache.pdfbox.cos.COSBase;
 import org.apache.pdfbox.cos.COSName;
@@ -56,7 +57,7 @@ public final class PDImageXObject extend
      */
     private static final Log LOG = LogFactory.getLog(PDImageXObject.class);
 
-    private BufferedImage cachedImage;
+    private SoftReference<BufferedImage> cachedImage;
     private PDColorSpace colorSpace;
     private PDResources resources; // current resource dictionary (has color spaces)
 
@@ -232,14 +233,18 @@ public final class PDImageXObject extend
 
     /**
      * {@inheritDoc}
-     * The returned images are cached for the lifetime of this XObject.
+     * The returned images are cached via a SoftReference.
      */
     @Override
     public BufferedImage getImage() throws IOException
     {
         if (cachedImage != null)
         {
-            return cachedImage;
+            BufferedImage cached = cachedImage.get();
+            if (cached != null)
+            {
+                return cached;
+            }
         }
 
         // get image as RGB
@@ -261,7 +266,7 @@ public final class PDImageXObject extend
             }
         }
 
-        cachedImage = image;
+        cachedImage = new SoftReference<BufferedImage>(image);
         return image;
     }