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 2015/10/19 18:51:17 UTC

svn commit: r1709449 - /pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/imageio/TIFFUtil.java

Author: tilman
Date: Mon Oct 19 16:51:17 2015
New Revision: 1709449

URL: http://svn.apache.org/viewvc?rev=1709449&view=rev
Log:
PDFBOX-3022: allow alternate github BaselineTIFFTagSet class

Modified:
    pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/imageio/TIFFUtil.java

Modified: pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/imageio/TIFFUtil.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/imageio/TIFFUtil.java?rev=1709449&r1=1709448&r2=1709449&view=diff
==============================================================================
--- pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/imageio/TIFFUtil.java (original)
+++ pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/imageio/TIFFUtil.java Mon Oct 19 16:51:17 2015
@@ -35,10 +35,26 @@ final class TIFFUtil
 {
     private static final Log LOG = LogFactory.getLog(TIFFUtil.class);
 
+    private static String tagSetClassName = "com.sun.media.imageio.plugins.tiff.BaselineTIFFTagSet";
+    
     private TIFFUtil()
     {
     }    
 
+    static
+    {
+        try
+        {
+            String alternateClassName = "com.github.jaiimageio.plugins.tiff.BaselineTIFFTagSet";
+            Class.forName(alternateClassName);
+            tagSetClassName = alternateClassName;
+        }
+        catch (ClassNotFoundException ex)
+        {
+            // ignore
+        }
+    }
+
     /**
      * Sets the ImageIO parameter compression type based on the given image.
      * @param image buffered image used to decide compression type
@@ -87,8 +103,7 @@ final class TIFFUtil
         if (root.getElementsByTagName("TIFFIFD").getLength() == 0)
         {
             ifd = new IIOMetadataNode("TIFFIFD");
-            ifd.setAttribute("tagSets",
-                             "com.sun.media.imageio.plugins.tiff.BaselineTIFFTagSet");
+            ifd.setAttribute("tagSets", tagSetClassName);
             root.appendChild(ifd);
         }
         else