From e7c04c77db2118dffe88f3f2e68d06735392d9ec Mon Sep 17 00:00:00 2001
From: luoliangyi <87842688@qq.com>
Date: Fri, 27 May 2022 10:22:25 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=A4=9A=E9=A1=B5=E6=97=8B?=
 =?UTF-8?q?=E8=BD=AC=E6=97=B6=E4=B8=8D=E8=83=BD=E6=97=8B=E8=BD=ACtiff?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/scanner/dialog_multirotateimagefile.cpp | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/app/scanner/dialog_multirotateimagefile.cpp b/app/scanner/dialog_multirotateimagefile.cpp
index 2a9af9dc..fa1e1268 100644
--- a/app/scanner/dialog_multirotateimagefile.cpp
+++ b/app/scanner/dialog_multirotateimagefile.cpp
@@ -48,6 +48,8 @@ void Dialog_MultiRotateImageFile::ThreadFunc(HGThread thread, HGPointer param)
 
         emit p->updateProgress(i);
 
+        HGImage img = nullptr;
+
         HGImgFmtReader imgFmtReader = nullptr;
         HGImgFmt_OpenImageReader(getStdString(p->m_fileList[i]).c_str(), 0, &imgFmtReader);
         if (nullptr != imgFmtReader)
@@ -56,7 +58,6 @@ void Dialog_MultiRotateImageFile::ThreadFunc(HGThread thread, HGPointer param)
             HGImgFmt_GetImagePageCount(imgFmtReader, &pageCount);
             if (1 == pageCount)
             {
-                HGImage img = nullptr;
                 HGImgFmt_LoadImageFromReader(imgFmtReader, 0, nullptr, 0, HGBASE_IMGORIGIN_TOP, &img);
                 if (nullptr != img)
                 {
@@ -83,18 +84,21 @@ void Dialog_MultiRotateImageFile::ThreadFunc(HGThread thread, HGPointer param)
                         HGBase_DestroyImage(img);
                         img = img2;
                     }
-
-                    if (HGBASE_ERR_OK == HGImgFmt_SaveImage(img, 0, nullptr, getStdString(p->m_fileList[i]).c_str()))
-                    {
-                        emit p->updateImageFile(p->m_fileList[i]);
-                    }
-
-                    HGBase_DestroyImage(img);
                 }
             }
 
             HGImgFmt_CloseImageReader(imgFmtReader);
         }
+
+        if (nullptr != img)
+        {
+            if (HGBASE_ERR_OK == HGImgFmt_SaveImage(img, 0, nullptr, getStdString(p->m_fileList[i]).c_str()))
+            {
+                emit p->updateImageFile(p->m_fileList[i]);
+            }
+
+            HGBase_DestroyImage(img);
+        }
     }
 
     emit p->finish();