mirror of
https://git.freebsd.org/ports.git
synced 2025-06-29 00:20:40 -04:00
27df5bce08
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@
69 lines
1.9 KiB
C++
69 lines
1.9 KiB
C++
--- src/Platform.cpp.orig 2021-11-25 00:56:59 UTC
|
|
+++ src/Platform.cpp
|
|
@@ -22,6 +22,10 @@
|
|
#include "Platform.h"
|
|
#include "CommonUtility/utils/PathUtils.h"
|
|
#include <fstream>
|
|
+#ifdef __FreeBSD__
|
|
+#include <pthread_np.h>
|
|
+#define pthread_tryjoin_np(tid,st) pthread_peekjoin_np(tid,st)
|
|
+#endif
|
|
#ifndef WIN32
|
|
errno_t fopen_s(
|
|
FILE** pFile,
|
|
@@ -105,7 +109,7 @@ DWORD WaitForSingleObject(
|
|
case THREAD_HANDLE_ID:
|
|
{
|
|
LPTHREAD_HANDLE hThreadHandle = (LPTHREAD_HANDLE) hHandle;
|
|
- if( (int)NULL == hThreadHandle->threadID ) {
|
|
+ if( 0 == hThreadHandle->threadID ) {
|
|
return WAIT_OBJECT_0;
|
|
}
|
|
int thread_status = 0;
|
|
@@ -121,7 +125,7 @@ DWORD WaitForSingleObject(
|
|
{
|
|
intptr_t lRet = (intptr_t)pStatus;
|
|
hThreadHandle->dwThreadStatus = (DWORD)lRet;
|
|
- hThreadHandle->threadID = (int)NULL;
|
|
+ hThreadHandle->threadID = 0;
|
|
}
|
|
}
|
|
while (EBUSY == thread_status);
|
|
@@ -180,7 +184,7 @@ BOOL CloseHandle(HANDLE hObject)
|
|
WaitForSingleObject(hObject, INFINITE);
|
|
LPTHREAD_HANDLE pThreadHandle = (LPTHREAD_HANDLE)hObject;
|
|
pThreadHandle->dwThreadStatus = 0;
|
|
- pThreadHandle->threadID = (int)NULL;
|
|
+ pThreadHandle->threadID = 0;
|
|
#endif
|
|
}
|
|
break;
|
|
@@ -347,7 +351,11 @@ DWORD GetModuleFileName(LPTSTR lpFilename, DWORD buf_s
|
|
{
|
|
DWORD dwRet = 0;
|
|
memset(lpFilename, 0, buf_size);
|
|
+#ifdef __FreeBSD__
|
|
+ readlink( "/proc/curproc/file", lpFilename, buf_size - 1 );
|
|
+#else
|
|
readlink( "/proc/self/exe", lpFilename, buf_size - 1 );
|
|
+#endif
|
|
dwRet = (DWORD)strlen(lpFilename);
|
|
return dwRet;
|
|
}
|
|
@@ -397,14 +405,14 @@ errno_t strcat_s(
|
|
}
|
|
if (NULL == strSource)
|
|
{
|
|
- strDestination[0] = (char)NULL;
|
|
+ strDestination[0] = '\0';
|
|
return EINVAL;
|
|
}
|
|
if ( (0 == numberOfElements)
|
|
|| (numberOfElements <= (strlen(strDestination) + strlen(strSource)))
|
|
)
|
|
{
|
|
- strDestination[0] = (char)NULL;
|
|
+ strDestination[0] = '\0';
|
|
return ERANGE;
|
|
}
|
|
strcat(strDestination, strSource);
|