From bc4002f3c8412fec7d84ed8cdc584cfe4d8057bf Mon Sep 17 00:00:00 2001 From: Henning Geinitz Date: Sun, 8 Apr 2001 15:53:05 +0000 Subject: [PATCH] 2001-04-08 Henning Meier-Geinitz * backend/mustek.c backend/mustek.desc backend/mustek.CHANGES Added detection of the TA for the Paragon 1200 SP Pro. Added warning about not supported Trust scanners. Changed description of contarst and brightness settings. Backend status is "stable" now. New version: 1.0-106. * acinclude.m4 aclocal.m4: Fixed comment concerning dc240. * configure configure.in include/sane/config.h.in: Added test for socklen_t in sys/socket.h. This fixes the compilation problem on Irix. * doc/sane-avision.man doc/sane-ricoh.man doc/sane-s9036.man doc/sane-tamarack.man: find-scanner is now called sane-find-scanner and installed on the system so it's not necessary to point to the tools directory. * frontend/scanimage.c: Fixed too long line in output. * sane-config.in: Name is sane-config again (was sane-backends-config due to the renaming of the package). * TODO: Removed entry about net.c not compiling on Irix and references to find-scanner in the man pages. Updated numbers of the compilation warnings. Still too many, however. --- acinclude.m4 | 2 +- aclocal.m4 | 9 ++++----- backend/mustek.CHANGES | 15 +++++++++++++++ backend/mustek.desc | 4 ++-- doc/sane-avision.man | 6 ++---- doc/sane-ricoh.man | 6 ++---- doc/sane-s9036.man | 6 ++---- doc/sane-tamarack.man | 6 ++---- frontend/scanimage.c | 2 +- include/sane/config.h.in | 3 +++ 10 files changed, 34 insertions(+), 25 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 00f2a8411..854802d62 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -83,7 +83,7 @@ AC_DEFUN(SANE_CHECK_PTAL, ]) # -# Checks for jpeg library >= v6B (61), needed for DC210 backend. +# Checks for jpeg library >= v6B (61), needed for DC210 and DC240 backends. AC_DEFUN(SANE_CHECK_JPEG, [ AC_CHECK_LIB(jpeg,jpeg_start_decompress, diff --git a/aclocal.m4 b/aclocal.m4 index 5388a4629..6c52cfc65 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -95,13 +95,12 @@ AC_DEFUN(SANE_CHECK_PTAL, ]) # -# Checks for jpeg library >= v6B (61), needed for DC210 backend. -# Henning Meier Geinitz +# Checks for jpeg library >= v6B (61), needed for DC210 and DC240 backends. AC_DEFUN(SANE_CHECK_JPEG, [ - AC_CHECK_LIB(jpeg,jpeg_start_decompress, + AC_CHECK_LIB(jpeg,jpeg_start_decompress, [ - AC_CHECK_HEADER(jconfig.h, + AC_CHECK_HEADER(jconfig.h, [ AC_MSG_CHECKING([for jpeglib - version >= 61 (6a)]) AC_EGREP_CPP(sane_correct_jpeg_lib_version_found, @@ -110,7 +109,7 @@ AC_DEFUN(SANE_CHECK_JPEG, #if JPEG_LIB_VERSION >= 61 sane_correct_jpeg_lib_version_found #endif - ],[sane_cv_use_libjpeg="yes"; LIBS="${LIBS} -ljpeg"; + ],[sane_cv_use_libjpeg="yes"; LIBS="${LIBS} -ljpeg"; AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)]) ],) ],) diff --git a/backend/mustek.CHANGES b/backend/mustek.CHANGES index 5f99de69d..5946113b2 100644 --- a/backend/mustek.CHANGES +++ b/backend/mustek.CHANGES @@ -1,5 +1,20 @@ CHANGES for the SANE Mustek backend +2001-04-08 + * Backend status is "stable" now. Hopefully this doesn't mean that new + bugs show up now :-) + +2001-04-01 + * Added detection of the Pro models TA (at least the 1200SP Pro). + * Added warning about real (not relabeled) Trust scanners. + +2001-03-31 + * Removed comment about brightness and contrast in the description strings + because you can't read them anyway in color mode (at least with xsane). + +2001-03-31 + * Released Mustek backend 1.0-105 + 2001-03-31 * Removed compilation warning in gamma_correction. * Fixed handling of tlx and brx when scanning with ADF (bug found by diff --git a/backend/mustek.desc b/backend/mustek.desc index 8cf3fe26e..813ad2c6e 100644 --- a/backend/mustek.desc +++ b/backend/mustek.desc @@ -9,8 +9,8 @@ ; :backend "mustek" ; name of backend -:version "1.0-105" ; version of backend -:status :beta ; :alpha, :beta, :stable, :new +:version "1.0-106" ; version of backend +:status :stable ; :alpha, :beta, :stable, :new :manpage "sane-mustek" ; name of manpage (if it exists) :url "http://hmg.home.pages.de/sane/" diff --git a/doc/sane-avision.man b/doc/sane-avision.man index 21d0af9b8..7b3435a42 100644 --- a/doc/sane-avision.man +++ b/doc/sane-avision.man @@ -20,10 +20,8 @@ Where is the path-name for the special device that corresponds to a SCSI scanner. The special device name must be a generic SCSI device or a symlink to such a device. The program -.IR find-scanner -helps to find out the correct device. It can be found in the -.IR tools -directory of the SANE distribution. Under Linux, such a device name +.IR sane-find-scanner +helps to find out the correct device. Under Linux, such a device name could be .I /dev/sga or diff --git a/doc/sane-ricoh.man b/doc/sane-ricoh.man index 5cb251ec6..bfb44d6f7 100644 --- a/doc/sane-ricoh.man +++ b/doc/sane-ricoh.man @@ -27,10 +27,8 @@ Where is the path-name for the special device that corresponds to a SCSI scanner. The special device name must be a generic SCSI device or a symlink to such a device. The program -.IR find-scanner -helps to find out the correct device. It can be found in the -.IR tools -directory of the SANE distribution. Under Linux, such a device name +.IR sane-find-scanner +helps to find out the correct device. Under Linux, such a device name could be .I /dev/sga or diff --git a/doc/sane-s9036.man b/doc/sane-s9036.man index f7d41a6b9..53179c87c 100644 --- a/doc/sane-s9036.man +++ b/doc/sane-s9036.man @@ -20,10 +20,8 @@ Where is the path-name for the special device that corresponds to a SCSI scanner. The special device name must be a generic SCSI device or a symlink to such a device. The program -.IR find-scanner -helps to find out the correct device. It can be found in the -.IR tools -directory of the SANE distribution. Under Linux, such a device name +.IR sane-find-scanner +helps to find out the correct device. Under Linux, such a device name could be .I /dev/sga or diff --git a/doc/sane-tamarack.man b/doc/sane-tamarack.man index d4f556370..ba59cf8ba 100644 --- a/doc/sane-tamarack.man +++ b/doc/sane-tamarack.man @@ -29,10 +29,8 @@ Where is the path-name for the special device that corresponds to a SCSI scanner. The special device name must be a generic SCSI device or a symlink to such a device. The program -.IR find-scanner -helps to find out the correct device. It can be found in the -.IR tools -directory of the SANE distribution. Under Linux, such a device name +.IR sane-find-scanner +helps to find out the correct device. Under Linux, such a device name could be .I /dev/sga or diff --git a/frontend/scanimage.c b/frontend/scanimage.c index 7433f91db..0372de6e3 100644 --- a/frontend/scanimage.c +++ b/frontend/scanimage.c @@ -1420,7 +1420,7 @@ main (int argc, char **argv) printf ("\nNo scanners were identified. If you were expecting " "something different,\ncheck that the scanner is plugged " "in, turned on and detected by the\nsane-find-scanner tool " - "(if appropriate). Please read the documentation which came\n" + "(if appropriate). Please read the documentation\nwhich came " "with this software (README, FAQ, manpages).\n"); if (defdevname) printf ("default device is `%s'\n", defdevname); diff --git a/include/sane/config.h.in b/include/sane/config.h.in index 4fb9c5f67..78e4f3b34 100644 --- a/include/sane/config.h.in +++ b/include/sane/config.h.in @@ -58,6 +58,9 @@ /* Define to `long' if doesn't define. */ #undef ssize_t +/* Define socklen_t as `int' if necessary. */ +#undef socklen_t + /* Define to `int' if doesn't define. */ #undef pid_t