合并代码
This commit is contained in:
commit
6154008bab
|
@ -358,6 +358,7 @@ void CHuaGoCorrectDlg::Scan()
|
||||||
config.g400params.dpi = m_iDpiIndex == 0 ? 1 : (m_iDpiIndex == 1 ? 2 : 3);//only support 200DPI ;// 1;//only support 200DPI
|
config.g400params.dpi = m_iDpiIndex == 0 ? 1 : (m_iDpiIndex == 1 ? 2 : 3);//only support 200DPI ;// 1;//only support 200DPI
|
||||||
config.g400params.pageSize = 0;
|
config.g400params.pageSize = 0;
|
||||||
config.g400params.isCorrect = !((CButton*)GetDlgItem(IDC_CKBORGINIMG))->GetCheck();
|
config.g400params.isCorrect = !((CButton*)GetDlgItem(IDC_CKBORGINIMG))->GetCheck();
|
||||||
|
config.g400params.lutmode = ((CButton*)GetDlgItem(IDC_CKBLUTMODE))->GetCheck();
|
||||||
config.g400params.isColor = m_iColorIndex == 1 ? 1 : 0;
|
config.g400params.isColor = m_iColorIndex == 1 ? 1 : 0;
|
||||||
config.g400params.doubleFeeded = TRUE;
|
config.g400params.doubleFeeded = TRUE;
|
||||||
config.g400params.enableStable = FALSE;
|
config.g400params.enableStable = FALSE;
|
||||||
|
|
|
@ -422,7 +422,9 @@ typedef union HG_ScanConfig
|
||||||
unsigned int doubleFeeded : 1;
|
unsigned int doubleFeeded : 1;
|
||||||
unsigned int enableStable : 1;
|
unsigned int enableStable : 1;
|
||||||
unsigned int enableLed : 1;
|
unsigned int enableLed : 1;
|
||||||
unsigned int reversed1 : 6;
|
unsigned int enableSizeDetect : 1;
|
||||||
|
unsigned int lutmode : 1;
|
||||||
|
unsigned int reversed1 : 4;
|
||||||
unsigned int isCorrect : 1;
|
unsigned int isCorrect : 1;
|
||||||
unsigned int dstHeight : 8;
|
unsigned int dstHeight : 8;
|
||||||
unsigned int reversed2 : 6;
|
unsigned int reversed2 : 6;
|
||||||
|
|
Loading…
Reference in New Issue