合并前保存更改

2022-11-18 10:33:34 +08:00 · 2022-11-18 10:33:34 +08:00 · 6f37f6d96c
parent d2b5ac090b
commit 6f37f6d96c
3 changed files with 2 additions and 1 deletions
--- a/huagao/Device/G400ScanConfig.cpp
+++ b/huagao/Device/G400ScanConfig.cpp
@ -18,7 +18,8 @@ G400ScanConfig::G400ScanConfig(GScanCap& gcap)
 #endif
 	cfg.params.isCorrect = 1;//1 机器校正
 	PaperStatus ps = { gcap.papertype,gcap.paperAlign };
-	cfg.params.pageSize = SupPaperTyps[ps];
+
+	cfg.params.pageSize =  SupPaperTyps[ps];
 	CSize size;
 #ifdef G300
 	size = PaperSize.GetPaperSize(TwSS::A4, 200.0f, gcap.paperAlign);//G300 最大支持A4幅面
--- a/huagao/huagaotwds.rc
+++ b/huagao/huagaotwds.rc
--- a/huagao/stdafx.h
+++ b/huagao/stdafx.h