From 6d75b82a9a3854a6ee59783579386552c480f015 Mon Sep 17 00:00:00 2001 From: yangjiaxuan <171295266@qq.com> Date: Tue, 23 Jan 2024 10:42:24 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=9B=BD=E4=BA=A7=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E5=8F=8C=E5=BC=A0=E6=A0=A1=E9=AA=8C=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E5=85=B3=E9=97=AD=E6=8C=89=E9=92=AE=E4=BD=86=E4=BC=9A=E7=BB=A7?= =?UTF-8?q?=E7=BB=AD=E6=89=AB=E6=8F=8F=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=9B?= =?UTF-8?q?BUG-886=20=E8=A7=A3=E5=86=B3=E5=9B=BD=E4=BA=A7=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E5=AF=BC=E5=87=BA=E7=95=8C=E9=9D=A2=EF=BC=8C=E8=B7=AF?= =?UTF-8?q?=E5=BE=84=E9=80=89=E6=8B=A9=E6=96=87=E4=BB=B6=E5=A4=B9=E4=BC=9A?= =?UTF-8?q?=E5=B4=A9=E6=BA=83=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=9BBUG-887?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/scanner2/custom_file_dialog.h | 4 +--- app/scanner2/dialog_abnormalimage.cpp | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/app/scanner2/custom_file_dialog.h b/app/scanner2/custom_file_dialog.h index c29793d2..8da14fd3 100644 --- a/app/scanner2/custom_file_dialog.h +++ b/app/scanner2/custom_file_dialog.h @@ -10,9 +10,7 @@ #include #include "base/HGBase.h" -#if !defined (HG_CMP_MSC) - #define USE_FILE_DLG_WITHOUT_PROMPT -#endif +//#define USE_FILE_DLG_WITHOUT_PROMPT template class custom_file_dlg diff --git a/app/scanner2/dialog_abnormalimage.cpp b/app/scanner2/dialog_abnormalimage.cpp index b041cff0..4c2bbf3a 100644 --- a/app/scanner2/dialog_abnormalimage.cpp +++ b/app/scanner2/dialog_abnormalimage.cpp @@ -9,7 +9,7 @@ Dialog_AbnormalImage::Dialog_AbnormalImage(HGImage image, QWidget *parent) : ui->setupUi(this); setWindowFlags(Qt::Dialog | Qt::WindowCloseButtonHint | Qt::WindowStaysOnTopHint); - m_result = HGBASE_ERR_FAIL; + m_result = HGSANE_ERR_IMAGE_DISCARD; m_view = new HGImgView(this); m_view->addImage(image);