Merge branch 'master' of http://192.168.100.140:8099/sane/code_device
This commit is contained in:
commit
246fa5dcb2
|
@ -18,7 +18,7 @@ namespace Device {
|
||||||
papersize.insert({ B4,SIZE{250,353} });
|
papersize.insert({ B4,SIZE{250,353} });
|
||||||
papersize.insert({ B5,SIZE{176,250} });
|
papersize.insert({ B5,SIZE{176,250} });
|
||||||
papersize.insert({ B6,SIZE{125,176} });
|
papersize.insert({ B6,SIZE{125,176} });
|
||||||
if(pid_ == 0x400)
|
if(pid_ == 0x400 || pid_ == 0x402)
|
||||||
papersize.insert({ MaxSize,SIZE{297,(long)(420 * 1.5)} });
|
papersize.insert({ MaxSize,SIZE{297,(long)(420 * 1.5)} });
|
||||||
else if(pid_ == 0x300)
|
else if(pid_ == 0x300)
|
||||||
papersize.insert({ MaxSize,SIZE{210,297 * 2} });
|
papersize.insert({ MaxSize,SIZE{210,297 * 2} });
|
||||||
|
|
|
@ -954,6 +954,10 @@ int hg_scanner_402::writedown_image_configuration(void)
|
||||||
{
|
{
|
||||||
ic.resolution_dst = resolution_;
|
ic.resolution_dst = resolution_;
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
ic.resolution_dst = resolution_;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue