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

中性调整

This commit is contained in:
13038267101 2023-04-20 17:34:14 +08:00
parent de8c6f082d
commit a5926a14b9
4 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hgdriver/hgdev/char_const.h
View File

@ -207,10 +207,10 @@
#define SCANNER_NAME_HG_G300 "HUAGOSCAN G300"
#define SCANNER_NAME_HG_G400 "HUAGOSCAN G400"
#define SCANNER_NAME_HGNEU_G100 "SCAN G100"
#define SCANNER_NAME_HGNEU_G200 "SCAN G200"
#define SCANNER_NAME_HGNEU_G300 "SCAN G300"
#define SCANNER_NAME_HGNEU_G400 "SCAN G400"
#define SCANNER_NAME_HGNEU_G100 "NEUSCAN G100"
#define SCANNER_NAME_HGNEU_G200 "NEUSCAN G200"
#define SCANNER_NAME_HGNEU_G300 "NEUSCAN G300"
#define SCANNER_NAME_HGNEU_G400 "NEUSCAN G400"
#define SCANNER_NAME_LSC_G42S "LANXUMSCAN G42S"
#define SCANNER_NAME_LSC_G52S "LANXUMSCAN G52S"

7
hgdriver/hgdev/hg_scanner.h
View File

@ -61,6 +61,13 @@
#else
#define HGVERSION_LIBNANE "libZGVersion.so"
#endif
#elif defined(OEM_NEUTRAL)
#define OEM_HUAGAO
#ifdef WIN32
#define HGVERSION_LIBNANE "NEUVersion.dll"
#else
#define HGVERSION_LIBNANE "libNeuVersion.so"
#endif
#else
#define OEM_HUAGAO
#ifdef WIN32

8
hgdriver/hgdev/image_process.cpp
View File

@ -110,6 +110,14 @@ using namespace std;
#define IMGPRC_LIBNANE "libZgImgProc.so"
#define HGBASE_LIBNAME "libZgBase.so"
#endif
#elif defined(OEM_NEUTRAL)
#ifdef WIN32
#define IMGPRC_LIBNANE "NEUImgProc.dll"
#define HGBASE_LIBNAME "NEUBase.dll"
#else
#define IMGPRC_LIBNANE "libNeuImgProc.so"
#define HGBASE_LIBNAME "libNeuBase.so"
#endif
#else
#ifdef WIN32
#define IMGPRC_LIBNANE "HGImgProc.dll"

2
hgdriver/hgdev/scanner_manager.cpp
View File

@ -62,7 +62,7 @@ g_supporting_devices[] = {
#elif defined(OEM_ZIGUANG)
{0x32ec, 0x0200, SANNNER_NAME_ZG_Q7110,"", "", & hg_scanner_mgr::create_scanner_g239}
, {0x32ec, 0x0210, SANNNER_NAME_ZG_Q1070, "", "", &hg_scanner_mgr::create_scanner_g402}
#elif defined(OEM_HUAGAO_NEU)
#elif defined(OEM_NEUTRAL)
{0x3072, PID_AND_NAME(100, SCANNER_NAME_HGNEU_G100), "G100", "",& hg_scanner_mgr::create_scanner_g100}
, {0x3072, PID_AND_NAME(139, SCANNER_NAME_HGNEU_G100), "G100", "", &hg_scanner_mgr::create_scanner_g239}
, {0x3072, PID_AND_NAME(200, SCANNER_NAME_HGNEU_G200), "G200", "", &hg_scanner_mgr::create_scanner_g100}