PDFBOX-5660: avoid graphics leak, as suggested by Valery Bokov; closes #440

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

Author: THausherr

pdfbox/src/main/java/org/apache/pdfbox/printing/PDFPrintable.java

@@ -205,9 +205,14 @@ public int print(Graphics graphics, PageFormat pageFormat, int pageIndex)
         {
             return NO_SUCH_PAGE;
         }
+
+        Graphics2D printerGraphics = null;
+        Graphics2D graphics2D = null;
+
         try
         {
-            Graphics2D graphics2D = (Graphics2D)graphics;
+            printerGraphics = (Graphics2D) graphics;
+            graphics2D = printerGraphics;
 
             // capture the DPI that will be used for rasterizing the image
             // if rasterizing is specified
@@ -266,7 +271,6 @@ public int print(Graphics graphics, PageFormat pageFormat, int pageIndex)
             }
 
             // rasterize to bitmap (optional)
-            Graphics2D printerGraphics = null;
             BufferedImage image = null;
             if (rasterDpi > 0)
             {
@@ -276,7 +280,6 @@ public int print(Graphics graphics, PageFormat pageFormat, int pageIndex)
                                           (int)(imageableHeight * dpiScale / scale),
                                           BufferedImage.TYPE_INT_ARGB);
 
-                printerGraphics = graphics2D;
                 graphics2D = image.createGraphics();
 
                 // rescale
@@ -303,12 +306,11 @@ public int print(Graphics graphics, PageFormat pageFormat, int pageIndex)
             }
 
             // draw rasterized bitmap (optional)
-            if (printerGraphics != null)
+            if (graphics2D != printerGraphics)
             {
                 printerGraphics.setBackground(Color.WHITE);
                 printerGraphics.clearRect(0, 0, image.getWidth(), image.getHeight());
                 printerGraphics.drawImage(image, 0, 0, null);
-                graphics2D.dispose();
             }
 
             return PAGE_EXISTS;
@@ -317,6 +319,13 @@ public int print(Graphics graphics, PageFormat pageFormat, int pageIndex)
         {
             throw new PrinterIOException(e);
         }
+        finally
+        {
+            if (graphics2D != null && graphics2D != printerGraphics)
+            {
+                graphics2D.dispose();
+            }
+        }
     }
 
     /**