3360发布版本代码提交

huagao/Device/G400ScanConfig.cpp

@@ -28,6 +28,7 @@ G400ScanConfig::G400ScanConfig(GScanCap& gcap)
 #endif// G300
 	cfg.params.dstHeight = (int)((size.cy+200)/100);
 	cfg.params.sizedetect = gcap.en_sizecheck;
+	//cfg.params.slow_moire = true;
 	cfg.params.reversed1 = cfg.params.reversed2 = cfg.params.lutmode = 0;
 }
 

huagao/Device/G400ScanConfig.h

@@ -19,7 +19,8 @@ public:
 			unsigned int enableLed : 1;
 			unsigned int sizedetect : 1;
 			unsigned int lutmode : 1;
-			unsigned int reversed1 : 4;
+			unsigned int slow_moire : 1;
+			unsigned int reversed1 : 3;
 			unsigned int isCorrect : 1;
 			unsigned int dstHeight : 8;
 			unsigned int reversed2 : 6;

huagao/Device/GScanO1003399.cpp

@@ -672,12 +672,12 @@ void GScanO1003399::start()
 			CryptoPP::StringSink* str_encode = new CryptoPP::StringSink(encoded);
 			CryptoPP::HexEncoder* hex_encode = new CryptoPP::HexEncoder(str_encode);
 			CryptoPP::StringSource* source_cipher = new CryptoPP::StringSource(cipher, true, hex_encode);
-			free(str_cip);
-			free(ecb_filter);
-			free(source_plain);
-			free(str_encode);
-			free(hex_encode);
-			free(source_cipher);
+			delete str_cip;
+			delete ecb_filter;
+			delete source_plain;
+			delete str_encode;
+			delete hex_encode;
+			delete source_cipher;
 			scanner_write_reg(m_usb, SR_DECODE_TOKEN, encoded.length());
 			m_usb->write_bulk(&encoded[0], encoded.length());
 			m_token = "null";
@@ -914,6 +914,10 @@ void GScanO1003399::imgproce(std::shared_ptr<std::vector<char>>& buff)
 	{
 		CImageApplyColorRecognition(m_param.automaticcolortype == 1 ? CImageApplyColorRecognition::ColorRecognitionMode::Color_Gray : CImageApplyColorRecognition::ColorRecognitionMode::Color_Mono).apply(mats,m_param.is_duplex);
 	}
+	//for (auto& node : mats)
+	//{
+	//	cv::putText(node, "Top left", cv::Point(100, 100), CV_FONT_HERSHEY_SIMPLEX, 2, cv::Scalar(0, 0, 255), 4, 8);
+	//}
 	if (m_param.is_split)
 	{
 		if (!is_back)

huagao/Device/GScanO400.cpp

@@ -783,12 +783,13 @@ void GScanO400::usbmain()
 						if (autopaper_stop)
 							break;
 					}
+					UpdateScanInfo(L" ");
 					if (sw_p.elapsed_s() < gcap.autopaper_timeout && (!autopaper_stop))
 						break;
 					else {
 						autopaper_stop = true;
 					}
-					UpdateScanInfo(L" ");
+
 				}
 				m_pImages->setscanflags(false);
 				std::this_thread::sleep_for(std::chrono::milliseconds(500));