G439调整伽马值

hgdriver/hgdev/char_const.h

@@ -124,7 +124,7 @@
         #define BRAND_URL_COMPANY_URL					    "http://www.microtek.com.cn"
         //#define BRAND_TITLE_TEL					        "联系电话"
         #define BRAND_TITLE_TEL						        "\350\201\224\347\263\273\347\224\265\350\257\235"
-        #define BRAND_COMPANY_TEL               			"4008203273|021-64856614-325"
+        #define BRAND_COMPANY_TEL               			"886-3-5772155"
         //#define BRAND_TITLE_ADDRESS             			"地址"
         #define BRAND_TITLE_ADDRESS             			"\345\234\260\345\235\200"
         // #define BRAND_COMPANY_ADDRESS           			"上海市徐汇区桂平路680号35号楼"

hgdriver/hgdev/hg_scanner.cpp

@@ -158,7 +158,7 @@ hg_scanner::hg_scanner(ScannerSerial serial, const char* dev_name, usb_io* io, i
 	, is_dpi_color_check(false), save_dpi_color_check_val(0.0f), is_auto_falt(false), HGVersion_mgr_(NULL), HGVersion_Init_(NULL)
 	, HGVersion_Islock_(NULL), HGVersion_Postlog_(NULL), HGVersion_Free_(NULL), Dynamicopen_HGVersion_pHandle_(NULL), pid_(pid), fetching_id_(-1)
 	, is_kernelsnap3288_230210_(false), color_correction_(false), is_kernelsnap_239_3C_(false), is_kernelsnap_239_220500_(false), is_kernelsnap3288_230303_(false)
-	, is_kernelsnap_211227_(false),is_auto_paper_scan_exit_time(60), is_read_int(true), is_kernelsnap_439_3C0606(false), is_auto_feedmode_(false)
+	, is_kernelsnap_211227_(false),is_auto_paper_scan_exit_time(60), is_read_int(true), is_kernelsnap_439_3C0606(false), is_auto_feedmode_(false), is_kernelsnap_239_220429_(false)
 {
 		#if !defined(_WIN32) && !defined(_WIN64) &&defined(x86_64)
 		isx86_Advan_ = false;
@@ -1950,6 +1950,11 @@ int hg_scanner::setting_error_extention(void* data, long* len)
 }
 int hg_scanner::setting_remove_texture(void* data, long* len)
 {
+	if (resolution_ > 300)
+	{
+		image_prc_param_.bits.remove_txtture = *((bool*)data) = false;
+		return SCANNER_ERR_DEVICE_NOT_SUPPORT;
+	}
 	image_prc_param_.bits.remove_txtture = *((bool*)data);
 
 	return SCANNER_ERR_OK;
@@ -1972,7 +1977,6 @@ int hg_scanner::setting_go_on_when_double_checked(void* data, long* len)
 	if (!is_kernelsnap_239_220500_ && val.compare(hg_log::lang_load(ID_OPTION_VALUE_SZTPCL_DQTXBTZSM)))
 	{
 		strcpy((char*)data, hg_log::lang_load(ID_OPTION_VALUE_SZTPCL_SCTXBTZSM));
-		//notify_ui_working_status(hg_log::lang_load(ID_STATU_DESC_SCANNER_ERR_DEVICE_NOT_SUPPORT), SANE_EVENT_ERROR, SCANNER_ERR_DEVICE_NOT_SUPPORT);
 		return SCANNER_ERR_DEVICE_NOT_SUPPORT;
 	}
 
@@ -2113,7 +2117,11 @@ int hg_scanner::setting_skew_check_level(void* data, long* len)
 int hg_scanner::setting_is_custom_gamma(void* data, long* len)
 {
 	custom_gamma_ = *((bool*)data);
-
+	if ((pid_ == 0x439|| pid_ == 0x139 || pid_ == 0x239) && custom_gamma_)
+	{
+		*((bool*)data) = custom_gamma_ = false;
+		return SCANNER_ERR_DEVICE_NOT_SUPPORT;
+	}
 	return SCANNER_ERR_OK;
 }
 int hg_scanner::setting_custom_gamma_data(void* data, long* len)

hgdriver/hgdev/hg_scanner.h

@@ -354,6 +354,7 @@ protected:
     bool            is_kernelsnap_239_3C_;      //支持偏色校正的版本，自适应配置
     bool            is_kernelsnap_439_3C0606;      //支持偏色校正的版本
     bool            is_kernelsnap_239_220500_;      //支持双张保留的版本
+    bool            is_kernelsnap_239_220429_;      //第一个安陆版本，支持设备日志导出
 
     bool            is_kernelsnap_211227_;      //此版本以下，不支持真实dpi ，只设置1下去
 

hgdriver/hgdev/image_process.cpp

@@ -511,7 +511,7 @@ namespace hg_imgproc
 						rmc = cv::IMREAD_COLOR;
 					}	
 					cv::Mat mat(cv::imdecode(*buf, rmc));
-					//cv::imwrite("imdecode.jpg",mat);
+					cv::imwrite("C:\\Users\\modehua\\Desktop\\image\\imdecode.jpg",mat);
 
 					if (mat.empty()) 
 					{
@@ -525,7 +525,7 @@ namespace hg_imgproc
 					else if (pid == 0x100 || pid == 0x200 || pid == 0x139 || pid == 0x239 || pid_ == 0x439)
 					{
 						Temp_mat.push_back(mat);
-						//cv::imwrite(std::to_string(i)+"_decode.jpg",mat);
+						cv::imwrite("C:\\Users\\modehua\\Desktop\\image\\decode1.jpg",mat);
 					}
 					else if (pid == 0x300 || pid == 0x400 || pid == 0x402 || pid == 0x302)
 					{

hgsane/sane_hg_mdw.cpp

@@ -1910,7 +1910,7 @@ SANE_Status hg_sane_middleware::set_option(SANE_Handle h, const void* option, SA
 		}
 		else
 		{
-			status = SANE_STATUS_INVAL;
+			status = local_utility::scanner_err_2_sane_statu(err);
 			err = (scanner_err)0;
 		}
 		if (after_do)