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 2017/06/19 17:16:25 UTC
svn commit: r1799240 -
/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/PDImageXObject.java
Author: tilman
Date: Mon Jun 19 17:16:25 2017
New Revision: 1799240
URL: http://svn.apache.org/viewvc?rev=1799240&view=rev
Log:
PDFBOX-2852: use jdk7 syntax
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=1799240&r1=1799239&r2=1799240&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 Mon Jun 19 17:16:25 2017
@@ -235,24 +235,15 @@ public final class PDImageXObject extend
*/
public static PDImageXObject createFromFileByContent(File file, PDDocument doc) throws IOException
{
- FileInputStream fileInputStream = null;
- BufferedInputStream bufferedInputStream = null;
FileType fileType = null;
- try
+ try (BufferedInputStream bufferedInputStream = new BufferedInputStream(new FileInputStream(file)))
{
- fileInputStream = new FileInputStream(file);
- bufferedInputStream = new BufferedInputStream(fileInputStream);
fileType = FileTypeDetector.detectFileType(bufferedInputStream);
}
catch (IOException e)
{
throw new IOException("Could not determine file type: " + file.getName(), e);
}
- finally
- {
- IOUtils.closeQuietly(fileInputStream);
- IOUtils.closeQuietly(bufferedInputStream);
- }
if (fileType == null)
{
throw new IllegalArgumentException("Image type not supported: " + file.getName());