mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS macosx10 (1.8.460); FILE MERGED

Browse Source 
2005/07/19 22:06:08 ericb 1.8.460.1: #i48285# scanner now works on Mac OSX (using SANE)
This commit is contained in:
Rüdiger Timm
2005-08-18 07:13:56 +00:00
parent 5bd0716377
commit d93f3c469f
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
extensions/source/scanner/sane.cxx
View File

@@ -2,9 +2,9 @@
* *
* $RCSfile: sane.cxx,v $ * $RCSfile: sane.cxx,v $
* *
* $Revision: 1.8 $ * $Revision: 1.9 $
* *
* last change: $Author: rt $ $Date: 2003-04-17 15:14:24 $ * last change: $Author: rt $ $Date: 2005-08-18 08:13:56 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@@ -67,6 +67,7 @@
#include <unistd.h> #include <unistd.h>
#include <sys/time.h> #include <sys/time.h>
#include <sys/types.h> #include <sys/types.h>
#include <sal/config.h>
#if (OSL_DEBUG_LEVEL > 1) || defined DBG_UTIL #if (OSL_DEBUG_LEVEL > 1) || defined DBG_UTIL
#include <stdarg.h> #include <stdarg.h>
@@ -213,12 +214,12 @@ Sane::~Sane()
void Sane::Init() void Sane::Init()
{ {
pSaneLib = dlopen( "libsane.so", RTLD_LAZY ); pSaneLib = dlopen( "libsane" SAL_DLLEXTENSION, RTLD_LAZY );
if( ! pSaneLib ) if( ! pSaneLib )
pSaneLib = dlopen( "libsane.so.1", RTLD_LAZY ); pSaneLib = dlopen( "libsane" SAL_DLLEXTENSION ".1", RTLD_LAZY );
// try reasonable places that might not be in the library search path // try reasonable places that might not be in the library search path
if( ! pSaneLib ) if( ! pSaneLib )
pSaneLib = dlopen( "/usr/local/lib/libsane.so", RTLD_LAZY ); pSaneLib = dlopen( "/usr/local/lib/libsane" SAL_DLLEXTENSION, RTLD_LAZY );
if( pSaneLib ) if( pSaneLib )
{ {
bSaneSymbolLoadFailed = FALSE; bSaneSymbolLoadFailed = FALSE;
@@ -268,7 +269,7 @@ void Sane::Init()
} }
#if (OSL_DEBUG_LEVEL > 1) || defined DBG_UTIL #if (OSL_DEBUG_LEVEL > 1) || defined DBG_UTIL
else else
fprintf( stderr, "libsane.so could not be opened: %s\n", fprintf( stderr, "libsane%s could not be opened: %s\n", SAL_DLLEXTENSION,
dlerror() ); dlerror() );
#endif #endif
} }