Merge branch 'master' of http://192.168.10.5:8099/sane/code_twain
This commit is contained in:
commit
2a28f8943e
|
@ -9,3 +9,4 @@ EXPORTS
|
|||
lang_get_string_id
|
||||
to_default_language
|
||||
from_default_language
|
||||
lang_refresh_language
|
||||
|
|
Binary file not shown.
|
@ -151,6 +151,7 @@ static oem from_str(const wchar_t* str)
|
|||
GET_ENUM_VALUE_W(OEM_NONE, s);
|
||||
GET_ENUM_VALUE_W(OEM_HANWANG, s);
|
||||
GET_ENUM_VALUE_W(OEM_LISICHENG, s);
|
||||
GET_ENUM_VALUE_W(OEM_CANGTIAN, s);
|
||||
GET_ENUM_VALUE_W(OEM_ZHONGJING, s);
|
||||
return OEM_NOT;
|
||||
}
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<LocalDebuggerCommandArguments>F:\projs\huagao\working\code_twain\twain\brand.h -oem hw</LocalDebuggerCommandArguments>
|
||||
<LocalDebuggerCommandArguments>C:\Users\modehua\Desktop\sane\sdk\include\huagao\brand.h -oem zj</LocalDebuggerCommandArguments>
|
||||
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
<LocalDebuggerCommandArguments>F:\projs\huagao\working\code_twain\twain\brand.h -oem lsc</LocalDebuggerCommandArguments>
|
||||
<LocalDebuggerCommandArguments>C:\Users\modehua\Desktop\sane\sdk\include\huagao\brand.h -oem zj</LocalDebuggerCommandArguments>
|
||||
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
|
||||
</PropertyGroup>
|
||||
</Project>
|
Loading…
Reference in New Issue