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);