You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ti...@apache.org on 2019/04/30 12:20:52 UTC

svn commit: r1858422 - in /pdfbox/branches/2.0/tools/src/main/java/org/apache/pdfbox/tools: ImageToPDF.java PDFBox.java

Author: tilman
Date: Tue Apr 30 12:20:52 2019
New Revision: 1858422

URL: http://svn.apache.org/viewvc?rev=1858422&view=rev
Log:
PDFBOX-4529: introduce ImageToPDF command line tool

Added:
    pdfbox/branches/2.0/tools/src/main/java/org/apache/pdfbox/tools/ImageToPDF.java
      - copied, changed from r1858413, pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/ImageToPDF.java
Modified:
    pdfbox/branches/2.0/tools/src/main/java/org/apache/pdfbox/tools/PDFBox.java

Copied: pdfbox/branches/2.0/tools/src/main/java/org/apache/pdfbox/tools/ImageToPDF.java (from r1858413, pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/ImageToPDF.java)
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/tools/src/main/java/org/apache/pdfbox/tools/ImageToPDF.java?p2=pdfbox/branches/2.0/tools/src/main/java/org/apache/pdfbox/tools/ImageToPDF.java&p1=pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/ImageToPDF.java&r1=1858413&r2=1858422&rev=1858422&view=diff
==============================================================================
--- pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/ImageToPDF.java (original)
+++ pdfbox/branches/2.0/tools/src/main/java/org/apache/pdfbox/tools/ImageToPDF.java Tue Apr 30 12:20:52 2019
@@ -52,7 +52,7 @@ public final class ImageToPDF
             app.usage();
         }
 
-        List<String> imageFilenames = new ArrayList<>();
+        List<String> imageFilenames = new ArrayList<String>();
         String pdfPath = args[args.length - 1];
 
         if (!pdfPath.endsWith(".pdf"))
@@ -98,11 +98,10 @@ public final class ImageToPDF
             }
         }
 
-        try (PDDocument doc = new PDDocument())
-        {
-            app.createPDFFromImages(doc, imageFilenames);
-            doc.save(pdfPath);
-        }
+        PDDocument doc = new PDDocument();
+        app.createPDFFromImages(doc, imageFilenames);
+        doc.save(pdfPath);
+        doc.close();
     }
 
     void createPDFFromImages(PDDocument doc, List<String> imageFilenames) throws IOException
@@ -119,17 +118,16 @@ public final class ImageToPDF
             PDPage page = new PDPage(actualMediaBox);
             doc.addPage(page);
 
-            try (PDPageContentStream contents = new PDPageContentStream(doc, page))
+            PDPageContentStream contents = new PDPageContentStream(doc, page);
+            if (resize)
             {
-                if (resize)
-                {
-                    contents.drawImage(pdImage, 0, 0, actualMediaBox.getWidth(), actualMediaBox.getHeight());
-                }
-                else
-                {
-                    contents.drawImage(pdImage, 0, 0, pdImage.getWidth(), pdImage.getHeight());
-                }
+                contents.drawImage(pdImage, 0, 0, actualMediaBox.getWidth(), actualMediaBox.getHeight());
+            }
+            else
+            {
+                contents.drawImage(pdImage, 0, 0, pdImage.getWidth(), pdImage.getHeight());
             }
+            contents.close();
         }
     }
 

Modified: pdfbox/branches/2.0/tools/src/main/java/org/apache/pdfbox/tools/PDFBox.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/tools/src/main/java/org/apache/pdfbox/tools/PDFBox.java?rev=1858422&r1=1858421&r2=1858422&view=diff
==============================================================================
--- pdfbox/branches/2.0/tools/src/main/java/org/apache/pdfbox/tools/PDFBox.java (original)
+++ pdfbox/branches/2.0/tools/src/main/java/org/apache/pdfbox/tools/PDFBox.java Tue Apr 30 12:20:52 2019
@@ -88,6 +88,10 @@ public final class PDFBox
             {
                 PDFToImage.main(arguments);
             }
+            else if (command.equals("ImageToPDF"))
+            {
+                ImageToPDF.main(arguments);
+            }
             else if (command.equals("TextToPDF"))
             {
                 TextToPDF.main(arguments);