diff --git a/hgdriver/hgdev/CMakeLists.txt b/hgdriver/hgdev/CMakeLists.txt
index 89eff29..3fda67e 100644
--- a/hgdriver/hgdev/CMakeLists.txt
+++ b/hgdriver/hgdev/CMakeLists.txt
@@ -50,9 +50,10 @@ target_link_libraries(${PROJECT_NAME} PRIVATE usb-1.0)
 target_include_directories(${PROJECT_NAME} PRIVATE ${PROJECT_SOURCE_DIR} 
                              ${PROJECT_SOURCE_DIR}/../3rdparty/nick
                              ${PROJECT_SOURCE_DIR}/../ImageProcess
-   						    ${PROJECT_SOURCE_DIR}/../3rdparty/opencv/include
+   						     ${PROJECT_SOURCE_DIR}/../3rdparty/opencv/include
                              ${PROJECT_SOURCE_DIR}/../3rdparty/tiff/include
-                             ${PROJECT_SOURCE_DIR}/../../../sdk/include                         
+                             ${PROJECT_SOURCE_DIR}/../../../sdk/include      
+							 ${PROJECT_SOURCE_DIR}/../wrapper                   
 
                                                   )
 set(LIBRARY_OUTPUT_PATH  ${PROJECT_SOURCE_DIR}/../../../build)
diff --git a/hgdriver/wrapper/CMakeLists.txt b/hgdriver/wrapper/CMakeLists.txt
index 17bb5f9..79bb56c 100644
--- a/hgdriver/wrapper/CMakeLists.txt
+++ b/hgdriver/wrapper/CMakeLists.txt
@@ -36,6 +36,7 @@ endif()
 target_link_libraries(${PROJECT_NAME} PRIVATE  
                       ${PROJECT_SOURCE_DIR}/../../../build/libgdev.a
       ${PROJECT_SOURCE_DIR}/../../../build/libgimgproc.a
+					  ${PROJECT_SOURCE_DIR}/../../../release/uos/${CMAKE_SYSTEM_PROCESSOR}/liblang.so
                ${PROJECT_SOURCE_DIR}/../3rdparty/opencv/lib/uos/${CMAKE_SYSTEM_PROCESSOR}/libopencv_imgproc.a
                       ${PROJECT_SOURCE_DIR}/../3rdparty/opencv/lib/uos/${CMAKE_SYSTEM_PROCESSOR}/libopencv_imgcodecs.a
                       ${PROJECT_SOURCE_DIR}/../3rdparty/opencv/lib/uos/${CMAKE_SYSTEM_PROCESSOR}/libopencv_highgui.a
@@ -49,6 +50,7 @@ target_link_libraries(${PROJECT_NAME} PRIVATE
                       ${PROJECT_SOURCE_DIR}/../3rdparty/opencv/lib/uos/${CMAKE_SYSTEM_PROCESSOR}/libquirc.a
                       ${PROJECT_SOURCE_DIR}/../3rdparty/opencv/lib/uos/${CMAKE_SYSTEM_PROCESSOR}/libzlib.a
                       ${PROJECT_SOURCE_DIR}/../3rdparty/opencv/lib/uos/${CMAKE_SYSTEM_PROCESSOR}/liblibwebp.a
+					  
                       ${PROJECT_SOURCE_DIR}/../../../sdk/lib/uos/${CMAKE_SYSTEM_PROCESSOR}/libusb-1.0.a #uos下放的先后顺序不对可能会导致库链接不上
   udev pthread dl m)
 
@@ -95,6 +97,7 @@ target_include_directories(${PROJECT_NAME} PRIVATE ${PROJECT_SOURCE_DIR}
                            ${PROJECT_SOURCE_DIR}/../3rdparty/tiff/include
                            ${PROJECT_SOURCE_DIR}/../ImageProcess
                            ${PROJECT_SOURCE_DIR}/../hgdev
+						   ${PROJECT_SOURCE_DIR}/../wrapper
                            ${PROJECT_SOURCE_DIR}/../../../sdk/include 
                             )                              
 set(LIBRARY_OUTPUT_PATH  ${PROJECT_SOURCE_DIR}/../../../release/uos/${CMAKE_SYSTEM_PROCESSOR})
diff --git a/hgsane/CMakeLists.txt b/hgsane/CMakeLists.txt
index de2991f..ca9f5ae 100644
--- a/hgsane/CMakeLists.txt
+++ b/hgsane/CMakeLists.txt
@@ -18,6 +18,7 @@ link_directories(${PROJECT_NAME} PRIVATE
             ${PROJECT_SOURCE_DIR}/../../release/uos/${CMAKE_SYSTEM_PROCESSOR}
                       )
 target_link_libraries(${PROJECT_NAME} PRIVATE hgdriver
+		   ${PROJECT_SOURCE_DIR}/../../release/uos/${CMAKE_SYSTEM_PROCESSOR}/liblang.so
 	       ${PROJECT_SOURCE_DIR}/../../release/uos/${CMAKE_SYSTEM_PROCESSOR}/libhgdriver.so
 	                ) 
 
diff --git a/hgsane/sane_hg_mdw.cpp b/hgsane/sane_hg_mdw.cpp
index 82dc360..623c544 100644
--- a/hgsane/sane_hg_mdw.cpp
+++ b/hgsane/sane_hg_mdw.cpp
@@ -171,7 +171,7 @@ namespace local_utility
 		return str > bgn;
 	}
 
-	// 暂不支持科学计数�?1.2e+10
+	// 暂不支持科学计数�?1.2e+10
 	bool get_number(const char*& str, double& val)
 	{
 		const char* bgn = str;
@@ -555,7 +555,7 @@ SANE_Option_Descriptor* hg_sane_middleware::string_option_to_SANE_descriptor(con
 	sod->unit = SANE_UNIT_NONE;
 	sod->size = values.size();
 	sod->cap = SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT		// 软件可设置选项
-				| SANE_CAP_AUTOMATIC;							// 硬件可设置默认�?
+				| SANE_CAP_AUTOMATIC;							// 硬件可设置默认�?
 	if (values.size())
 	{
 		sod->constraint_type = SANE_CONSTRAINT_STRING_LIST;
@@ -676,7 +676,7 @@ SANE_Option_Descriptor* hg_sane_middleware::number_option_to_SANE_descriptor(con
 	sod->unit = SANE_UNIT_NONE;
 	sod->size = sizeof(SANE_Word);
 	sod->cap = SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT		// 软件可设置选项
-		/*| SANE_CAP_AUTOMATIC*/;									// 硬件可设置默认�?
+		/*| SANE_CAP_AUTOMATIC*/;									// 硬件可设置默认�?
 
 	if (values.size())
 	{
@@ -726,7 +726,7 @@ SANE_Option_Descriptor* hg_sane_middleware::number_option_to_SANE_descriptor(con
 	sod->unit = SANE_UNIT_NONE;
 	sod->size = sizeof(SANE_Word);
 	sod->cap = SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT		// 软件可设置选项
-		/*| SANE_CAP_AUTOMATIC*/;									// 硬件可设置默认�?
+		/*| SANE_CAP_AUTOMATIC*/;									// 硬件可设置默认�?
 
 	if (values.size())
 	{
@@ -1002,7 +1002,7 @@ SANE_Option_Descriptor* hg_sane_middleware::from_json(scanner_handle h, const st
 		//if (jsn->get_value("enable", enabled) && !enabled)
 		//	ret->cap |= SANE_CAP_INACTIVE;
 
-		// 关联�?
+		// 关联�?
 		json*	depend = NULL;
 		SLAVEOP so;
 		if (jsn->get_value("depend_or", depend))
@@ -1129,10 +1129,10 @@ SANE_Option_Descriptor* hg_sane_middleware::find_stored_descriptor(scanner_handl
 		if (IS_PTR_NUMBER(option))
 		{
 			if (id)
-				*id = (int)option;
+				*id = (SANE_Int)(long long)option;
 			for (const auto& v : (*it)->opts)
 			{
-				if (v.option_no == (int)option)
+				if (v.option_no == (SANE_Int)(long long)option)
 					return v.desc;
 			}
 		}
@@ -1349,7 +1349,7 @@ SANE_Status hg_sane_middleware::get_devices(const SANE_Device*** device_list, SA
 
 	if (hgerr == SCANNER_ERR_INSUFFICIENT_MEMORY)
 	{
-		count += 4;		// 为两次hg_scanner_enum间隙可能新增的设备预留空�?
+		count += 4;		// 为两次hg_scanner_enum间隙可能新增的设备预留空�?
 		dev = (ScannerInfo*)local_utility::acquire_memory(sizeof(ScannerInfo) * count, "hg_sane_middleware::get_devices");
 		hgerr = hg_scanner_enum(dev, &count, local_only);
 		if (hgerr != SCANNER_ERR_OK)
@@ -1727,7 +1727,7 @@ bool hg_sane_middleware::is_ready(void)
 }
 
 /// <summary>
-/// 关联项处�?
+/// 关联项处�?
 bool hg_sane_middleware::compare_val_equal(const char* cur_val, const char* limit_l, const char* limit_r)
 {
 	return strcmp(cur_val, limit_l) == 0;
diff --git a/hgsane/sane_hg_mdw.h b/hgsane/sane_hg_mdw.h
index 9d7ac2e..140489f 100644
--- a/hgsane/sane_hg_mdw.h
+++ b/hgsane/sane_hg_mdw.h
@@ -89,7 +89,7 @@ typedef struct _dev_inst
 		return dev == h;
 	}
 
-	struct _dev_inst()
+	 _dev_inst()
 	{
 		dev = nullptr;
 		name = "";