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

新增 7010偏色数据

This commit is contained in:
13038267101 2023-11-16 14:33:41 +08:00
parent 49cb1e71b5
commit 1fcd17c167
4 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hgdriver/ImageProcess/ImageApplyColorCastCorrect.cpp
View File

@ -41,6 +41,10 @@ CImageApplyColorCastCorrect::CImageApplyColorCastCorrect(PreScheme ps)
points_x = { 0, 6, 11, 19, 37, 48, 66, 79, 89, 97, 108, 122, 138, 143, 147, 150, 158, 170, 199, 233, 248, 249, 250, 252 }; points_x = { 0, 6, 11, 19, 37, 48, 66, 79, 89, 97, 108, 122, 138, 143, 147, 150, 158, 170, 199, 233, 248, 249, 250, 252 };
points_y = { 26, 31, 33, 36, 40, 44, 56, 92, 104, 114, 126, 135, 141, 143, 146, 151, 169, 198, 218, 227, 252, 266, 272, 276 }; points_y = { 26, 31, 33, 36, 40, 44, 56, 92, 104, 114, 126, 135, 141, 143, 146, 151, 169, 198, 218, 227, 252, 266, 272, 276 };
break; break;
case CImageApplyColorCastCorrect::G300_7010:
points_x = { 1, 4, 6, 9, 13, 19, 23, 29, 40, 55, 72, 86, 97, 106, 117, 133, 143, 149, 155, 160, 170, 182, 206, 233 };
points_y = { 252, 11, 17, 21, 26, 31, 33, 36, 40, 44, 56, 92, 104, 114, 126, 135, 141, 143, 146, 151, 169, 198, 218, 227 };
break;
default: default:
points_x = { 0, 255 }; points_x = { 0, 255 };
points_y = { 0, 255 }; points_y = { 0, 255 };

1
hgdriver/ImageProcess/ImageApplyColorCastCorrect.h
View File

@ -32,6 +32,7 @@ public:
G200, G200,
G300, G300,
G300_D8, G300_D8,
G300_7010,
G400_402, G400_402,
G400_3288, G400_3288,
Android302 Android302

2
hgdriver/hgdev/hg_scanner.cpp
View File

@ -1486,7 +1486,7 @@ bool hg_scanner::jsn_reorganize()
if (firmware_sup_device_7010) if (firmware_sup_device_7010)
{ {
erase_option(SANE_STD_OPT_NAME_SIZE_CHECK); erase_option(SANE_STD_OPT_NAME_SIZE_CHECK);
erase_option(SANE_STD_OPT_NAME_COLOR_CORRECTION); //erase_option(SANE_STD_OPT_NAME_COLOR_CORRECTION);
erase_option(SANE_STD_OPT_NAME_LENS_DIRTY); erase_option(SANE_STD_OPT_NAME_LENS_DIRTY);
erase_option(SANE_STD_OPT_NAME_DOUBLE_FEED_HANDLE); erase_option(SANE_STD_OPT_NAME_DOUBLE_FEED_HANDLE);

3
hgdriver/hgdev/image_process.cpp
View File

@ -1414,6 +1414,8 @@ namespace hg_imgproc
int tmp = -1; int tmp = -1;
CImageApplyColorCastCorrect::PreScheme deviceType = (CImageApplyColorCastCorrect::PreScheme)tmp; CImageApplyColorCastCorrect::PreScheme deviceType = (CImageApplyColorCastCorrect::PreScheme)tmp;
if (param_.device_7010)
deviceType = CImageApplyColorCastCorrect::G300_7010;
if (0x300 == pid_) if (0x300 == pid_)
{ {
deviceType = CImageApplyColorCastCorrect::G300_D8; deviceType = CImageApplyColorCastCorrect::G300_D8;
@ -1430,6 +1432,7 @@ namespace hg_imgproc
{ {
deviceType = CImageApplyColorCastCorrect::Android302; deviceType = CImageApplyColorCastCorrect::Android302;
} }
CImageApplyColorCastCorrect ColorCastCorrect(deviceType); CImageApplyColorCastCorrect ColorCastCorrect(deviceType);
ColorCastCorrect.apply(mats, true); ColorCastCorrect.apply(mats, true);