From c6d89b8e809a9f9fad348a7959f98cc149becfd4 Mon Sep 17 00:00:00 2001
From: zhanghai <120228220@qq.com>
Date: Thu, 16 Nov 2023 11:30:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81gif?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/docus/sw/fenpan/FenpanService.java    |  2 +-
 .../com/docus/sw/souyin/SuoyinService.java    |  2 +-
 src/test/java/JpmTest.java                    | 52 +++++++++++--------
 3 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/src/main/java/com/docus/sw/fenpan/FenpanService.java b/src/main/java/com/docus/sw/fenpan/FenpanService.java
index 4896bc8..b93f49e 100644
--- a/src/main/java/com/docus/sw/fenpan/FenpanService.java
+++ b/src/main/java/com/docus/sw/fenpan/FenpanService.java
@@ -116,7 +116,7 @@ public class FenpanService {
                     //非图片模式，跳过。
                     if (!(file.getName().endsWith(".jpg") || file.getName().endsWith(".png")
                             || file.getName().endsWith(".jpeg") || file.getName().endsWith(".tif")
-                            || file.getName().endsWith(".tiff")) || file.getName().endsWith(".jp2") || file.getName().endsWith(".jpm")) {
+                            || file.getName().endsWith(".tiff")) || file.getName().endsWith(".jp2") || file.getName().endsWith(".jpm")|| file.getName().endsWith(".gif")) {
                         continue;
                     }
 
diff --git a/src/main/java/com/docus/sw/souyin/SuoyinService.java b/src/main/java/com/docus/sw/souyin/SuoyinService.java
index 9b69912..cc8083e 100644
--- a/src/main/java/com/docus/sw/souyin/SuoyinService.java
+++ b/src/main/java/com/docus/sw/souyin/SuoyinService.java
@@ -73,7 +73,7 @@ public class SuoyinService {
                             //非图片模式，跳过。
                             if(!(docfile.getName().endsWith(".jpg") || docfile.getName().endsWith(".png")
                                     || docfile.getName().endsWith(".jpeg") || docfile.getName().endsWith(".tif")
-                                    || docfile.getName().endsWith(".tiff")|| file.getName().endsWith(".jp2") || file.getName().endsWith(".jpm"))){
+                                    || docfile.getName().endsWith(".tiff")|| file.getName().endsWith(".jp2") || file.getName().endsWith(".jpm"))|| file.getName().endsWith(".gif")){
                                 continue;
                             }
                             if (file.getName().endsWith(".jp2") || file.getName().endsWith(".jpm")) {
diff --git a/src/test/java/JpmTest.java b/src/test/java/JpmTest.java
index 253f8d1..7a50af7 100644
--- a/src/test/java/JpmTest.java
+++ b/src/test/java/JpmTest.java
@@ -4,6 +4,9 @@ import com.drew.metadata.Directory;
 import com.drew.metadata.Metadata;
 import com.drew.metadata.Tag;
 import com.drew.metadata.exif.ExifSubIFDDirectory;
+import org.apache.commons.imaging.ImageInfo;
+import org.apache.commons.imaging.ImageReadException;
+import org.apache.commons.imaging.Imaging;
 
 import java.awt.image.BufferedImage;
 import java.io.File;
@@ -31,31 +34,34 @@ public class JpmTest {
         // 查询特定Tag：拍摄日期（OS X上叫内容创建时间）
         Date date = directory.getDate(ExifSubIFDDirectory.TAG_DATETIME_ORIGINAL);
     }
-    public static void main(String[] args) throws ImageProcessingException, IOException {
-//        File file = new File("C:\\Users\\zhanghai\\Documents\\WeChat Files\\wxid_wexo4ubjorso22\\FileStorage\\File\\2023-11\\JP2/16-35数转模 - 0001.jp2");
-//        ImageInfo imageInfo = Imaging.getImageInfo(file);
-//        int height = imageInfo.getHeight();
-//        int width = imageInfo.getWidth();
-//        int physicalHeightDpi = imageInfo.getPhysicalHeightDpi();
+    public static void main(String[] args) throws ImageProcessingException, IOException, ImageReadException {
+        File file = new File("C:\\Users\\zhanghai\\Documents\\WeChat Files\\wxid_wexo4ubjorso22\\FileStorage\\File\\2023-11\\GIF\\新建文件夹 - 副本 - 副本/0000007.gif");
+        ImageInfo imageInfo = Imaging.getImageInfo(file);
+        int height = imageInfo.getHeight();
+        int width = imageInfo.getWidth();
+        System.out.println(height);
+        System.out.println(width);
+        int physicalHeightDpi = imageInfo.getPhysicalHeightDpi();
+        System.out.println(physicalHeightDpi);
 
 
-        String filePath = "C:\\Users\\zhanghai\\Documents\\WeChat Files\\wxid_wexo4ubjorso22\\FileStorage\\File\\2023-11\\1.jpm"; // 替换成你的 JP2 图像文件路径
-
-        try {
-            // 读取 JPEG 2000 图像文件
-            File inputFile = new File(filePath);
-            BufferedImage image = ImageIO.read(inputFile);
-//            ImageInfo imageInfo = Imaging.getImageInfo(inputFile);
-            int height = image.getHeight();
-            int width = image.getWidth();
-//            int physicalHeightDpi = image.getPhysicalHeightDpi();
-            System.out.println(height);
-            System.out.println(width);
-
-
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
+//        String filePath = "C:\\Users\\zhanghai\\Documents\\WeChat Files\\wxid_wexo4ubjorso22\\FileStorage\\File\\2023-11\\1.jpm"; // 替换成你的 JP2 图像文件路径
+//
+//        try {
+//            // 读取 JPEG 2000 图像文件
+//            File inputFile = new File(filePath);
+//            BufferedImage image = ImageIO.read(inputFile);
+////            ImageInfo imageInfo = Imaging.getImageInfo(inputFile);
+//            int height = image.getHeight();
+//            int width = image.getWidth();
+////            int physicalHeightDpi = image.getPhysicalHeightDpi();
+//            System.out.println(height);
+//            System.out.println(width);
+//
+//
+//        } catch (IOException e) {
+//            e.printStackTrace();
+//        }
 
 //        new JpmTest().viewExif(filePath);
     }