From 692c82837d3a8d93a14ae75b138867dcfbe30596 Mon Sep 17 00:00:00 2001
From: zengwh <81383286@qq.com>
Date: Wed, 10 Mar 2021 15:49:51 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3tif=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E6=9C=89=E6=97=B6=E8=AF=BB=E5=8F=96=E4=B8=8D=E5=88=B0=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                     |  5 ++---
 src/main/java/com/emr/util/img2PdfUtil.java | 12 ++++++++++--
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 454fb2c..73da4fc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -232,12 +232,11 @@
             <artifactId>hibernate-validator</artifactId>
             <version>${hibernate-validator.version}</version>
         </dependency>
-        <!--<dependency>
+        <dependency>
             <groupId>com.twelvemonkeys.imageio</groupId>
             <artifactId>imageio-tiff</artifactId>
-            <version>3.4.1</version>
+            <version>3.6</version>
         </dependency>
--->
     </dependencies>
 
     <build>
diff --git a/src/main/java/com/emr/util/img2PdfUtil.java b/src/main/java/com/emr/util/img2PdfUtil.java
index 83dda6f..b964bcb 100644
--- a/src/main/java/com/emr/util/img2PdfUtil.java
+++ b/src/main/java/com/emr/util/img2PdfUtil.java
@@ -11,11 +11,14 @@ import com.lowagie.text.pdf.*;
 import com.sun.media.jai.codec.ImageCodec;
 import com.sun.media.jai.codec.ImageEncoder;
 import com.sun.media.jai.codec.JPEGEncodeParam;
+import com.twelvemonkeys.imageio.plugins.tiff.TIFFImageReaderSpi;
+import com.twelvemonkeys.imageio.plugins.tiff.TIFFImageWriterSpi;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
 import javax.imageio.ImageIO;
+import javax.imageio.spi.IIORegistry;
 import javax.media.jai.JAI;
 import javax.media.jai.RenderedOp;
 import javax.servlet.http.HttpServletRequest;
@@ -152,8 +155,13 @@ public class img2PdfUtil {
         BufferedImage bufImg = null;
         Graphics2D g = null;
         try {
-            //srcImg = ImageIO.read(srcImgFile);//文件转化为图片
             srcImg = ImageIO.read(new FileInputStream(srcImgFile));
+            if(null == srcImg){
+                IIORegistry registry = IIORegistry.getDefaultInstance();
+                registry.registerServiceProvider(new com.twelvemonkeys.imageio.plugins.tiff.TIFFImageWriterSpi());
+                registry.registerServiceProvider(new com.twelvemonkeys.imageio.plugins.tiff.TIFFImageReaderSpi());
+                srcImg = ImageIO.read(new FileInputStream(srcImgFile));
+            }
             //System.out.println("读取图片"+(end-start)/1000.0+"s");
             int srcImgWidth = srcImg.getWidth(null);//获取图片的宽
             int srcImgHeight = srcImg.getHeight(null);//获取图片的高
@@ -194,7 +202,7 @@ public class img2PdfUtil {
         } catch (Exception e) {
             e.printStackTrace();
             e.getMessage();
-            return null;
+            return outPath;
         }finally {
             if(null != g){
                 g.dispose();// 释放资源*/