lmh188
/
twain3.0
mirror of http://192.168.1.51:8099/lmh188/twain3.0
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

修复G300/400 交换正反面问题

This commit is contained in:
masayume 2021-08-03 11:55:10 +08:00
parent 59d673106e
commit 043aba521c
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
huagao/Device/ImageMatQueue.cpp
View File

@ -510,8 +510,8 @@ void ImageMatQueue::proc()
cv::flip(front, front, 0); cv::flip(front, front, 0);
cv::flip(front, front, 1); cv::flip(front, front, 1);
} }
mats.push_back(back); mats.push_back(scanParam.is_switchfrontback ? back : front);
mats.push_back(front); mats.push_back(scanParam.is_switchfrontback ? front : back);
remove(info.path.c_str()); remove(info.path.c_str());
} }
else else

5
huagao/GscanJsonConfig.cpp
View File

@ -740,7 +740,7 @@ json GscanJsonConfig::GscancapToJson(GScanCap& cap)
js[CONFIG][AUTOCONTRAST] = cap.is_autocontrast; js[CONFIG][AUTOCONTRAST] = cap.is_autocontrast;
js[CONFIG][CONTRAST] = cap.contrast; js[CONFIG][CONTRAST] = cap.contrast;
js[CONFIG][GAMMA_] = cap.gamma; js[CONFIG][GAMMA_] = cap.gamma;
js[CONFIG][CROPMODEL] = cap.normalCrop;
js[CONFIG][FILTERTYPE] = cap.filter; js[CONFIG][FILTERTYPE] = cap.filter;
js[CONFIG][ENHANCECOLOR] = cap.enhance_color; js[CONFIG][ENHANCECOLOR] = cap.enhance_color;
js[CONFIG][SHARPENTYPE] = cap.sharpen; js[CONFIG][SHARPENTYPE] = cap.sharpen;
@ -792,6 +792,7 @@ GScanCap GscanJsonConfig::JsonToGscancap(json& js)
#ifdef UV #ifdef UV
cap.hardwarecaps.en_uv = json_cast(js[CONFIG][ENUVMODEL]).to_int(); cap.hardwarecaps.en_uv = json_cast(js[CONFIG][ENUVMODEL]).to_int();
#endif // UV #endif // UV
cap.normalCrop = json_cast(js[CONFIG][CROPMODEL]).to_bool();
cap.detachnoise.is_detachnoise = json_cast(js[CONFIG][DETACHNOISE]).to_int(); cap.detachnoise.is_detachnoise = json_cast(js[CONFIG][DETACHNOISE]).to_int();
cap.detachnoise.detachnoise = json_cast(js[CONFIG][DETACHNOISEVALUE]).to_int(); cap.detachnoise.detachnoise = json_cast(js[CONFIG][DETACHNOISEVALUE]).to_int();
cap.brightness = json_cast(js[CONFIG][BRIGHTNESS]).to_float(); cap.brightness = json_cast(js[CONFIG][BRIGHTNESS]).to_float();
@ -837,6 +838,7 @@ json GscanJsonConfig::GetDefaultJson()
"iPaperAlign": 0 , "iPaperAlign": 0 ,
"iEnSizeCheck": false , "iEnSizeCheck": false ,
"bAuotCrop": true , "bAuotCrop": true ,
"bcropmodel": false,
"iResolution": 200 , "iResolution": 200 ,
"iDuplex": true , "iDuplex": true ,
"bDiscardBlank": false , "bDiscardBlank": false ,
@ -888,6 +890,7 @@ json GscanJsonConfig::GetDefaultJson()
"iPaperAlign": 0 , "iPaperAlign": 0 ,
"iEnSizeCheck": false , "iEnSizeCheck": false ,
"bAuotCrop": true , "bAuotCrop": true ,
"bcropmodel": false,
"iResolution": 200 , "iResolution": 200 ,
"iDuplex": true , "iDuplex": true ,
"bDiscardBlank": false , "bDiscardBlank": false ,