mirror
/
sane-project-backends
kopia lustrzana https://gitlab.com/sane-project/backends
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

2004-01-12 Matthew Duggan <stauff1@users.sourceforge.net> 

* backend/canon_pp-dev.c backend/canon_pp-io.c backend/canon_pp.c
          backend/canon_pp.h: Fix various compile warnings (Bug #300407).
          Also fix bug in parsing config file.
        * doc/descriptions/canon_pp.desc: Bump version number.
merge-requests/1/head
Matthew Duggan 2004-01-11 22:24:07 +00:00
rodzic 02334639e8
commit 656a9d8be3
6 zmienionych plików z 63 dodań i 29 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

7
ChangeLog
Wyświetl plik

@ -1,3 +1,10 @@
2004-01-12 Matthew Duggan <stauff1@users.sourceforge.net>
* backend/canon_pp-dev.c backend/canon_pp-io.c backend/canon_pp.c
backend/canon_pp.h: Fix various compile warnings (Bug #300407).
Also fix bug in parsing config file.
* doc/descriptions/canon_pp.desc: Bump version number.
2004-01-11 Henning Meier-Geinitz <henning@meier-geinitz.de> 2004-01-11 Henning Meier-Geinitz <henning@meier-geinitz.de>
* tools/sane-desc.c: When generating HTML anchor names, make sure * tools/sane-desc.c: When generating HTML anchor names, make sure

8
backend/canon_pp-dev.c
Wyświetl plik

@ -55,6 +55,10 @@
#include <lalloca.h> #include <lalloca.h>
#endif #endif
#ifndef NOSANE
#include "../include/sane/config.h"
#endif
#include <sys/time.h> #include <sys/time.h>
#include <unistd.h> #include <unistd.h>
#include <errno.h> #include <errno.h>
@ -81,7 +85,9 @@ static void DBG(int level, const char *format, ...)
#else #else
/* Definitions which only apply to SANE compiles */ /* Definitions which only apply to SANE compiles */
#ifndef VERSION
#define VERSION "$Revision$" #define VERSION "$Revision$"
#endif
#define DEBUG_DECLARE_ONLY #define DEBUG_DECLARE_ONLY
#include "canon_pp.h" #include "canon_pp.h"
@ -1144,7 +1150,7 @@ int sanei_canon_pp_calibrate(scanner_parameters *sp, char *cal_file)
/* Header */ /* Header */
if (safe_write(outfile, header, strlen(header) + 1) < 0) if (safe_write(outfile, header, strlen(header) + 1) < 0)
DBG(10, "Write error on calibration file %s", cal_file); DBG(10, "Write error on calibration file %s", cal_file);
if (safe_write(outfile, (char *)&fileversion, sizeof(int)) < 0) if (safe_write(outfile, (const char *)&fileversion, sizeof(int)) < 0)
DBG(10, "Write error on calibration file %s", cal_file); DBG(10, "Write error on calibration file %s", cal_file);
/* Data */ /* Data */

7
backend/canon_pp-io.c
Wyświetl plik

@ -49,6 +49,10 @@
Simon Krix <kinsei@users.sourceforge.net> Simon Krix <kinsei@users.sourceforge.net>
*/ */
#ifndef NOSANE
#include "../include/sane/config.h"
#endif
#include <sys/time.h> #include <sys/time.h>
#include <unistd.h> #include <unistd.h>
#include <ieee1284.h> #include <ieee1284.h>
@ -71,7 +75,10 @@ static void DBG(int level, const char *format, ...)
#else #else
/* Definitions which only apply to SANE compiles */ /* Definitions which only apply to SANE compiles */
#ifndef VERSION
#define VERSION "$Revision$" #define VERSION "$Revision$"
#endif
/* Fix problem with DBG macro definition having a - in the name */ /* Fix problem with DBG macro definition having a - in the name */
#define DEBUG_DECLARE_ONLY #define DEBUG_DECLARE_ONLY
#include "canon_pp.h" #include "canon_pp.h"

63
backend/canon_pp.c
Wyświetl plik

@ -50,13 +50,20 @@
#include <lalloca.h> /* MUST come first for AIX! */ #include <lalloca.h> /* MUST come first for AIX! */
#endif #endif
#define VERSION "$Revision$"
#define BACKEND_NAME canon_pp #define BACKEND_NAME canon_pp
#define THREE_BITS 0xE0 #define THREE_BITS 0xE0
#define TWO_BITS 0xC0 #define TWO_BITS 0xC0
#define MM_PER_IN 25.4 #define MM_PER_IN 25.4
#ifndef NOSANE
#include "../include/sane/config.h"
#endif
#ifndef VERSION
#define VERSION "$Revision$"
#endif
#include <string.h> #include <string.h>
#include <math.h> #include <math.h>
#include <unistd.h> #include <unistd.h>
@ -139,7 +146,8 @@ sane_init (SANE_Int *vc, SANE_Auth_Callback cb)
DBG_INIT(); DBG_INIT();
#if defined PACKAGE && defined VERSION #if defined PACKAGE && defined VERSION
DBG(2, ">> sane_init(%p, %p): " PACKAGE " " VERSION "\n", vc, cb); DBG(2, ">> sane_init(%p, %p): " PACKAGE " " VERSION "\n",
(const void*)vc, (const void*)cb);
#endif #endif
if(vc) if(vc)
@ -228,8 +236,9 @@ sane_init (SANE_Int *vc, SANE_Auth_Callback cb)
while (s_tmp != NULL) while (s_tmp != NULL)
{ {
if (!strcmp(s_tmp->params.port->name, if (!strcmp(s_tmp->params.port->name,
tmp_port)) tmp_port+1))
{ {
*tmp_port = '\0';
s_tmp->weights_file = tmp_wf; s_tmp->weights_file = tmp_wf;
DBG(100, "sane_init: Parsed " DBG(100, "sane_init: Parsed "
"cal.\n"); "cal.\n");
@ -280,7 +289,7 @@ sane_init (SANE_Int *vc, SANE_Auth_Callback cb)
/* now work out which port it blongs to */ /* now work out which port it blongs to */
tmp_port = strstr(line+10, " ") + 1; tmp_port = strstr(line+10, " ");
if (tmp_port == NULL) if (tmp_port == NULL)
{ {
@ -441,7 +450,7 @@ sane_get_devices (const SANE_Device ***dl, SANE_Bool local)
CANONP_Scanner *dev; CANONP_Scanner *dev;
int i; int i;
DBG(2, ">> sane_get_devices (%p, %d)\n", dl, local); DBG(2, ">> sane_get_devices (%p, %d)\n", (const void*)dl, local);
if (dl == NULL) if (dl == NULL)
{ {
@ -588,9 +597,11 @@ sane_open (SANE_String_Const name, SANE_Handle *h)
if (cs->weights_file != NULL) if (cs->weights_file != NULL)
DBG(2, "sane_open: >> load_weights(%s, %p)\n", DBG(2, "sane_open: >> load_weights(%s, %p)\n",
cs->weights_file, &(cs->params)); cs->weights_file,
(const void *)(&(cs->params)));
else else
DBG(2, "sane_open: >> load_weights(NULL, %p)\n", &(cs->params)); DBG(2, "sane_open: >> load_weights(NULL, %p)\n",
(const void *)(&(cs->params)));
tmp = sanei_canon_pp_load_weights(cs->weights_file, &(cs->params)); tmp = sanei_canon_pp_load_weights(cs->weights_file, &(cs->params));
DBG(2, "sane_open: << %d load_weights\n", tmp); DBG(2, "sane_open: << %d load_weights\n", tmp);
@ -691,7 +702,7 @@ sane_get_option_descriptor (SANE_Handle h, SANE_Int opt)
if (cs->opened == SANE_FALSE) if (cs->opened == SANE_FALSE)
{ {
DBG(1,"sane_get_option_descriptor: That scanner (%p) ain't " DBG(1,"sane_get_option_descriptor: That scanner (%p) ain't "
"open yet\n", cs); "open yet\n", h);
return NULL; return NULL;
} }
@ -717,7 +728,6 @@ sane_control_option (SANE_Handle h, SANE_Int opt, SANE_Action act,
DBG(2, ">> sane_control_option (h=%p, opt=%d, act=%d)\n", DBG(2, ">> sane_control_option (h=%p, opt=%d, act=%d)\n",
h,opt,act); h,opt,act);
/* Do some sanity checks on the parameters /* Do some sanity checks on the parameters
* note that val can be null for buttons */ * note that val can be null for buttons */
if ((h == NULL) || ((val == NULL) && (opt != OPT_CAL))) if ((h == NULL) || ((val == NULL) && (opt != OPT_CAL)))
@ -725,7 +735,8 @@ sane_control_option (SANE_Handle h, SANE_Int opt, SANE_Action act,
* frontends seem to like passing a null */ * frontends seem to like passing a null */
{ {
DBG(1,"sane_control_option: Frontend passed me a null! " DBG(1,"sane_control_option: Frontend passed me a null! "
"(h=%p,val=%p,info=%p)\n",h,val,info); "(h=%p,val=%p,info=%p)\n",h,
val,info);
return SANE_STATUS_INVAL; return SANE_STATUS_INVAL;
} }
@ -738,14 +749,14 @@ sane_control_option (SANE_Handle h, SANE_Int opt, SANE_Action act,
if (cs->opened == SANE_FALSE) if (cs->opened == SANE_FALSE)
{ {
DBG(1,"sane_control_option: That scanner (%p) ain't " DBG(1,"sane_control_option: That scanner (%p) ain't "
"open yet\n", cs); "open yet\n", h);
return SANE_STATUS_INVAL; return SANE_STATUS_INVAL;
} }
if (cs->scanning == SANE_TRUE) if (cs->scanning == SANE_TRUE)
{ {
DBG(1,"sane_control_option: That scanner (%p) is scanning!\n", DBG(1,"sane_control_option: That scanner (%p) is scanning!\n",
cs); h);
return SANE_STATUS_DEVICE_BUSY; return SANE_STATUS_DEVICE_BUSY;
} }
@ -833,13 +844,11 @@ sane_control_option (SANE_Handle h, SANE_Int opt, SANE_Action act,
if ((cs->weights_file==NULL) || if ((cs->weights_file==NULL) ||
cs->cal_readonly cs->cal_readonly
) )
DBG(2, ">> calibrate(%p, " DBG(2, ">> calibrate(x, "
"NULL)\n", "NULL)\n");
&(cs->params));
else else
DBG(2, ">> calibrate(%p," DBG(2, ">> calibrate(x,"
"%s)\n", "%s)\n",
&(cs->params),
cs->weights_file); cs->weights_file);
if (cs->cal_readonly) tmp = if (cs->cal_readonly) tmp =
@ -911,7 +920,7 @@ sane_get_parameters (SANE_Handle h, SANE_Parameters *params)
if (cs->opened == SANE_FALSE) if (cs->opened == SANE_FALSE)
{ {
DBG(1,"sane_get_parameters: That scanner (%p) ain't " DBG(1,"sane_get_parameters: That scanner (%p) ain't "
"open yet\n", cs); "open yet\n", h);
return SANE_STATUS_INVAL; return SANE_STATUS_INVAL;
} }
@ -1010,7 +1019,7 @@ sane_start (SANE_Handle h)
if (cs->opened == SANE_FALSE) if (cs->opened == SANE_FALSE)
{ {
DBG(1,"sane_start: That scanner (%p) ain't " DBG(1,"sane_start: That scanner (%p) ain't "
"open yet\n", cs); "open yet\n", h);
return SANE_STATUS_INVAL; return SANE_STATUS_INVAL;
} }
@ -1088,7 +1097,7 @@ sane_start (SANE_Handle h)
cs->scan.mode = cs->vals[OPT_COLOUR_MODE]; cs->scan.mode = cs->vals[OPT_COLOUR_MODE];
DBG(10, ">> init_scan(%p, %p)\n", &(cs->params), &(cs->scan)); DBG(10, ">> init_scan()\n");
tmp = sanei_canon_pp_init_scan(&(cs->params), &(cs->scan)); tmp = sanei_canon_pp_init_scan(&(cs->params), &(cs->scan));
DBG(10, "<< %d init_scan\n", tmp); DBG(10, "<< %d init_scan\n", tmp);
@ -1129,7 +1138,8 @@ sane_read (SANE_Handle h, SANE_Byte *buf, SANE_Int maxlen, SANE_Int *lenp)
static SANE_Byte *lbuf; static SANE_Byte *lbuf;
static unsigned int bytesleft; static unsigned int bytesleft;
DBG(2, ">> sane_read (h=%p, buf=%p, maxlen=%d)\n", h, buf, maxlen); DBG(2, ">> sane_read (h=%p, buf=%p, maxlen=%d)\n", h,
(const void *)buf, maxlen);
/* default to returning 0 - for errors */ /* default to returning 0 - for errors */
*lenp = 0; *lenp = 0;
@ -1244,9 +1254,9 @@ sane_read (SANE_Handle h, SANE_Byte *buf, SANE_Int maxlen, SANE_Int *lenp)
cs->scan.xresolution, cs->scan.yresolution, cs->scan.xresolution, cs->scan.yresolution,
cs->scan.mode, lines); cs->scan.mode, lines);
DBG(2, ">> read_segment(%p, %p, %p, %d, %d, %d)\n", DBG(2, ">> read_segment(x, x, x, %d, %d, %d)\n",
&is, &(cs->params), &(cs->scan), lines, lines, cs->cal_valid,
cs->cal_valid, cs->scan.height - cs->lines_scanned); cs->scan.height - cs->lines_scanned);
tmp = sanei_canon_pp_read_segment(&is, &(cs->params), &(cs->scan), tmp = sanei_canon_pp_read_segment(&is, &(cs->params), &(cs->scan),
lines, cs->cal_valid, lines, cs->cal_valid,
cs->scan.height - cs->lines_scanned); cs->scan.height - cs->lines_scanned);
@ -1394,7 +1404,7 @@ sane_close (SANE_Handle h)
if (cs->opened == SANE_FALSE) if (cs->opened == SANE_FALSE)
{ {
DBG(1,"sane_close: That scanner (%p) ain't " DBG(1,"sane_close: That scanner (%p) ain't "
"open yet\n", cs); "open yet\n", h);
return; return;
} }
@ -1710,7 +1720,8 @@ sane_set_io_mode (SANE_Handle h, SANE_Bool non_blocking)
SANE_Status SANE_Status
sane_get_select_fd (SANE_Handle h, SANE_Int *fdp) sane_get_select_fd (SANE_Handle h, SANE_Int *fdp)
{ {
DBG(2, ">> sane_get_select_fd (%p, %p) (not supported)\n", h, fdp); DBG(2, ">> sane_get_select_fd (%p, %p) (not supported)\n", h,
(const void *)fdp);
DBG(2, "<< sane_get_select_fd\n"); DBG(2, "<< sane_get_select_fd\n");
return SANE_STATUS_UNSUPPORTED; return SANE_STATUS_UNSUPPORTED;
} }

3
backend/canon_pp.h
Wyświetl plik

@ -60,7 +60,10 @@
#define DEBUG_NOT_STATIC #define DEBUG_NOT_STATIC
#include "../include/sane/sanei_debug.h" #include "../include/sane/sanei_debug.h"
#ifndef PACKAGE
#define PACKAGE "Canon Parallel SANE Backend" #define PACKAGE "Canon Parallel SANE Backend"
#endif
#define CMODE_COLOUR "Colour" #define CMODE_COLOUR "Colour"
#define CMODE_MONO "Mono" #define CMODE_MONO "Mono"
#define CANONP_CONFIG_FILE "canon_pp.conf" #define CANONP_CONFIG_FILE "canon_pp.conf"

2
doc/descriptions/canon_pp.desc
Wyświetl plik

@ -10,7 +10,7 @@
:backend "canon_pp" ; name of backend :backend "canon_pp" ; name of backend
:manpage "sane-canon_pp" :manpage "sane-canon_pp"
:version "0.32" ; version of backend :version "0.33" ; version of backend
:url "http://canon-fb330p.sourceforge.net" ; backend home page :url "http://canon-fb330p.sourceforge.net" ; backend home page