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

Some fixes for the Epson Stylus CX 1500

merge-requests/1/head
Oliver Schwartz 2006-01-06 20:59:17 +00:00
rodzic 00c45a8897
commit 01e26557f8
4 zmienionych plików z 25 dodań i 10 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

7
ChangeLog
Wyświetl plik

@ -1,4 +1,9 @@
2006-01-05 Stéphane Voltz <stefdev@modulonet.fr>
2006-01-06 Oliver Schwartz <Oliver.Schwartz@gmx.de>
* backend/snapscan-scsi.c backend/snapscan-options.c backend/snapscan.c:
Some fixes for the Epson Stylus CX1500
2006-01-05 St<53>hane Voltz <stefdev@modulonet.fr>
* backend/umax_pp_low.c: removed unused local variable

6
backend/snapscan-options.c
Wyświetl plik

@ -609,7 +609,8 @@ static void init_options (SnapScan_Scanner * ps)
ps->val[OPT_QUALITY_CAL].b = SANE_FALSE;
}
if (ps->pdev->model == PRISA5150)
if ((ps->pdev->model == PRISA5150) ||
(ps->pdev->model == STYLUS_CX1500))
{
po[OPT_QUALITY_CAL].cap |= SANE_CAP_INACTIVE;
ps->val[OPT_QUALITY_CAL].b = SANE_TRUE;
@ -1616,6 +1617,9 @@ SANE_Status sane_control_option (SANE_Handle h,
/*
* $Log$
* Revision 1.35 2006/01/06 20:59:17 oliver-guest
* Some fixes for the Epson Stylus CX 1500
*
* Revision 1.34 2006/01/01 22:57:01 oliver-guest
* Added calibration data for Benq 5150 / 5250, preliminary support for Epson Stylus CX 1500
*

7
backend/snapscan-scsi.c
Wyświetl plik

@ -447,6 +447,7 @@ static SANE_Status inquiry (SnapScan_Scanner *pss)
pss->read_bytes = INQUIRY_RET_LEN_EPSON;
break;
case PRISA5000:
case PRISA5150:
pss->read_bytes = INQUIRY_RET_LEN_5000;
break;
default:
@ -551,6 +552,7 @@ static SANE_Status inquiry (SnapScan_Scanner *pss)
case PERFECTION3490:
case PRISA5150:
case PRISA5000:
case STYLUS_CX1500:
pss->bpp = 14;
break;
default:
@ -1359,7 +1361,7 @@ static SANE_Status calibrate (SnapScan_Scanner *pss)
return send_calibration_5150(pss);
}
if ((pss->hconfig & HCFG_CAL_ALLOWED) && line_length) {
if (line_length) {
int num_lines = pss->phys_buf_sz / line_length;
if (num_lines > NUM_CALIBRATION_LINES)
{
@ -1513,6 +1515,9 @@ static SANE_Status download_firmware(SnapScan_Scanner * pss)
/*
* $Log$
* Revision 1.55 2006/01/06 20:59:17 oliver-guest
* Some fixes for the Epson Stylus CX 1500
*
* Revision 1.54 2006/01/01 22:57:01 oliver-guest
* Added calibration data for Benq 5150 / 5250, preliminary support for Epson Stylus CX 1500
*

15
backend/snapscan.c
Wyświetl plik

@ -79,8 +79,7 @@
#define EXPECTED_MAJOR 1
#define MINOR_VERSION 4
#define BUILD 51
#define BUILD 52
#define BACKEND_NAME snapscan
#ifdef __GNUC__
@ -169,23 +168,22 @@ static inline int is_colour_mode (SnapScan_Mode m)
static inline int calibration_line_length(SnapScan_Scanner *pss)
{
int pos_factor = pss->actual_res;
int pos_factor;
int pixel_length;
switch (pss->pdev->model)
{
case STYLUS_CX1500:
case PRISA5000E:
case PRISA5000:
case PRISA5150:
pos_factor = 600;
break;
case PERFECTION1270:
case PERFECTION1670:
case PERFECTION2480:
case PERFECTION3490:
pos_factor = 800;
break;
pos_factor = pss->actual_res / 2;
default:
pos_factor = pss->actual_res;
break;
}
pixel_length = pos_factor * 8.5;
@ -1926,6 +1924,9 @@ SANE_Status sane_get_select_fd (SANE_Handle h, SANE_Int * fd)
/*
* $Log$
* Revision 1.66 2006/01/06 20:59:17 oliver-guest
* Some fixes for the Epson Stylus CX 1500
*
* Revision 1.65 2006/01/01 23:02:55 oliver-guest
* Added snapscan-data.c to Makefile.in
*