撤销上次提交内容:删除了屏蔽ocr的x86_64宏定义
This commit is contained in:
parent
679f6dee78
commit
827e7765fd
|
@ -41,7 +41,7 @@ Dialog_AquireInto::Dialog_AquireInto(QWidget* parent) :
|
||||||
ui->lineEdit_fileName->setText(getCfgValue("aquire", "namePrefix", QString("HGScan")));
|
ui->lineEdit_fileName->setText(getCfgValue("aquire", "namePrefix", QString("HGScan")));
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(OEM_LISICHENG)
|
#if defined(OEM_LISICHENG) || defined(x86_64)
|
||||||
ui->cbox_format->removeItem(11);
|
ui->cbox_format->removeItem(11);
|
||||||
ui->cbox_format->removeItem(10);
|
ui->cbox_format->removeItem(10);
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -25,7 +25,7 @@ static struct
|
||||||
int attr;
|
int attr;
|
||||||
}g_support_type[] =
|
}g_support_type[] =
|
||||||
{
|
{
|
||||||
#if defined(OEM_LISICHENG)
|
#if defined(OEM_LISICHENG) || defined(x86_64)
|
||||||
{".jpg", "JPG - JPEG / JFIF", FILE_TYPE_ATTR_MORE_OPTIONS}
|
{".jpg", "JPG - JPEG / JFIF", FILE_TYPE_ATTR_MORE_OPTIONS}
|
||||||
, {".bmp", "BMP - Windows Bitmap", FILE_TYPE_ATTR_NO_MORE_OPTION}
|
, {".bmp", "BMP - Windows Bitmap", FILE_TYPE_ATTR_NO_MORE_OPTION}
|
||||||
, {".png", "PNG - Portable Network Graphics", FILE_TYPE_ATTR_NO_MORE_OPTION}
|
, {".png", "PNG - Portable Network Graphics", FILE_TYPE_ATTR_NO_MORE_OPTION}
|
||||||
|
|
|
@ -69,7 +69,7 @@ Dialog_SaveAs::Dialog_SaveAs(QWidget *parent) :
|
||||||
ui->fileDialog->setOption(QFileDialog::DontUseNativeDialog, true);
|
ui->fileDialog->setOption(QFileDialog::DontUseNativeDialog, true);
|
||||||
ui->fileDialog->setOption(QFileDialog::ReadOnly, true); // disable 'Delete' menu item
|
ui->fileDialog->setOption(QFileDialog::ReadOnly, true); // disable 'Delete' menu item
|
||||||
ui->fileDialog->setSizeGripEnabled(false);
|
ui->fileDialog->setSizeGripEnabled(false);
|
||||||
#if defined(OEM_LISICHENG)
|
#if defined(OEM_LISICHENG) || defined(x86_64)
|
||||||
ui->fileDialog->setNameFilter("JPG - JPEG / JFIF(*.jpg);;"
|
ui->fileDialog->setNameFilter("JPG - JPEG / JFIF(*.jpg);;"
|
||||||
"BMP - Windows Bitmap(*.bmp);;"
|
"BMP - Windows Bitmap(*.bmp);;"
|
||||||
"PNG - Portable Network Graphics(*.png);;"
|
"PNG - Portable Network Graphics(*.png);;"
|
||||||
|
|
Loading…
Reference in New Issue