ports/graphics/epsonscan2/files/patch-src_Controller_Src_Scanner_Scanner.cpp
Rainer Hurling 27df5bce08 graphics/epsonscan2: Add new port for Epson Scanners
This is a port of the Seiko/Epson Epsonscan2 scanner engine and GUI[1].

It provides a complete alternative to sane/xsane with its own scanner engine and GUI.
It also provides a sane back-end library (libsane-epsonscan2.so) so that it works with the sane package.

There are two parts to this port:
  - graphics/epsonscan2 - the main scanner engine and GUI that
    works with (most) USB scanners
  - graphics/epsonscan2-non-free-plugin - support for Epson's
    Linux binary that adds network access to scanners and
    usb access to some particular scanners

Please read the file %%PREFIX%%/lib/epsonscan2/Read_me.FreeBSD for notes on how to set this up and use it.

[1] https://download.ebz.epson.net/man/linux/epsonscan2_e.html

PR:		261891
Reviewed by:	(partly) Tatsuki Makino <tatsuki_makino@hotmail.com>, diizzy@
2022-04-03 10:44:09 +02:00

27 lines
872 B
C++

--- src/Controller/Src/Scanner/Scanner.cpp.orig 2021-11-25 00:56:59 UTC
+++ src/Controller/Src/Scanner/Scanner.cpp
@@ -188,7 +188,7 @@ void Scanner::EngineCallBackReceiver(EngineEventType e
error == kSDIErrorDataSend ||
error == kSDIErrorInvalidResponse ||
error == kSDIErrorDeviceFatalError ||
- error == kESErrorDeviceOpenError )
+ error == (SDIError) kESErrorDeviceOpenError )
{
SDI_TRACE_LOG("communication error occurs");
isOpened_ = false;
@@ -202,13 +202,13 @@ SDIError Scanner::Open()
SDIError err;
if (engine_) {
err = engine_->Open();
- if(err != kSDIErrorNone){
+ if(err != kSDIErrorNone && err != kSDIErrorDeviceOpen){
return err;
}
}
if (engineSecond_) {
err = engineSecond_->Open();
- if(err != kSDIErrorNone){
+ if(err != kSDIErrorNone && err != kSDIErrorDeviceOpen){
return err;
}
}