lmh188
/
code_twain
mirror of http://192.168.10.5:8099/sane/code_twain.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

v4.15; 准备抽象IO

This commit is contained in:
gb 2022-08-05 11:16:50 +08:00
parent f516e78263
commit a849f32f62
6 changed files with 50 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
device/scanner.rc
View File

@ -51,8 +51,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 4,14,10000,22216
PRODUCTVERSION 4,14,10000,22216
FILEVERSION 4,15,10000,22217
PRODUCTVERSION 4,15,10000,22217
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@ -69,12 +69,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "宁波华高信息科技有限公司"
VALUE "FileDescription", "华高扫描仪应用程序"
VALUE "FileVersion", "4.14.10000.22216"
VALUE "FileVersion", "4.15.10000.22217"
VALUE "InternalName", "scanner.dll"
VALUE "LegalCopyright", "Copyright (C) 10000"
VALUE "OriginalFilename", "scanner.dll"
VALUE "ProductName", "HUAGOScan"
VALUE "ProductVersion", "4.14.10000.22216"
VALUE "ProductVersion", "4.15.10000.22217"
END
END
BLOCK "VarFileInfo"

2
device/scanner.vcxproj
View File

@ -268,6 +268,7 @@ move /Y "$(OutDirFullPath)$(ProjectName).pdb" "%FINAL_DIR%"
<ClCompile Include="..\..\code_device\hgdriver\ImageProcess\ImageProcess_Public.cpp" />
<ClCompile Include="..\..\code_device\hgdriver\ImageProcess\IMulti.cpp" />
<ClCompile Include="..\..\code_device\hgdriver\wrapper\ini_file.cpp" />
<ClCompile Include="scanner_io\scanner_io.cpp" />
<ClCompile Include="win_usb\usbview\devnode.c" />
<ClCompile Include="win_usb\usbview\enum.c" />
<ClCompile Include="win_usb\win_usb.cpp" />
@ -343,6 +344,7 @@ move /Y "$(OutDirFullPath)$(ProjectName).pdb" "%FINAL_DIR%"
<ClInclude Include="..\..\sdk\include\sane\sane_ex.h" />
<ClInclude Include="..\..\sdk\include\sane\sane_option_definitions.h" />
<ClInclude Include="resource.h" />
<ClInclude Include="scanner_io\scanner_io.h" />
<ClInclude Include="win_usb\usbview\enum.h" />
<ClInclude Include="win_usb\usbview\usbdesc.h" />
<ClInclude Include="win_usb\usbview\uvcdesc.h" />

9
device/scanner.vcxproj.filters
View File

@ -25,6 +25,9 @@
<Filter Include="usb\usbview">
<UniqueIdentifier>{06629bf8-5d3e-4855-916b-260169824839}</UniqueIdentifier>
</Filter>
<Filter Include="IO">
<UniqueIdentifier>{3d22771d-a2cc-4972-ab37-f1979d973a4f}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\code_device\hgdriver\wrapper\huagaoxxx_warraper_ex.cpp">
@ -198,6 +201,9 @@
<ClCompile Include="..\..\code_device\hgdriver\hgdev\hg_scanner_439.cpp">
<Filter>dev</Filter>
</ClCompile>
<ClCompile Include="scanner_io\scanner_io.cpp">
<Filter>IO</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\code_device\hgdriver\ImageProcess\ImageApply.h">
@ -422,6 +428,9 @@
<ClInclude Include="..\..\code_device\hgdriver\hgdev\hg_scanner_439.h">
<Filter>dev</Filter>
</ClInclude>
<ClInclude Include="scanner_io\scanner_io.h">
<Filter>IO</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="device.def">

2
device/scanner_io/scanner_io.cpp Normal file
View File

@ -0,0 +1,2 @@
#include "scanner_io.h"

29
device/scanner_io/scanner_io.h Normal file
View File

@ -0,0 +1,29 @@
#pragma once
//
// Base IO class
//
// Date: 2022-08-05
//
enum scanner_cmd
{
};
enum scanner_event
{
SCANNER_EVENT_NONE = 0,
SCANNER_EVENT_DEVICE_ARRIVED,
SCANNER_EVENT_DEVICE_LEFT,
SCANNER_EVENT_
};
struct io_handler
{
void (*on_io_event)(int ev_type, void* data, int len);
};
class scanenr_io
{
};

8
sane/sane.rc
View File

@ -248,8 +248,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 4,14,10000,22216
PRODUCTVERSION 4,14,10000,22216
FILEVERSION 4,15,10000,22217
PRODUCTVERSION 4,15,10000,22217
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@ -266,12 +266,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "宁波华高信息科技有限公司"
VALUE "FileDescription", "华高扫描仪应用程序"
VALUE "FileVersion", "4.14.10000.22216"
VALUE "FileVersion", "4.15.10000.22217"
VALUE "InternalName", "sane.dll"
VALUE "LegalCopyright", "Copyright (C) 10000"
VALUE "OriginalFilename", "sane.dll"
VALUE "ProductName", "HUAGOScan"
VALUE "ProductVersion", "4.14.10000.22216"
VALUE "ProductVersion", "4.15.10000.22217"
END
END
BLOCK "VarFileInfo"