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

Revert previous 'fix', disable 2400 dpi for Epson 3490, use 1600 dpi instead

merge-requests/1/head
Oliver Schwartz 2005-11-17 23:47:11 +00:00
rodzic cbd7009d4d
commit 0b1279193f
4 zmienionych plików z 22 dodań i 13 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

4
ChangeLog
Wyświetl plik

@ -1,7 +1,7 @@
2005-11-18 Oliver Schwartz <Oliver.Schwartz@gmx.de>
* backend/snapscan-scsi.c backend/snapscan-sources.c:
(Potential) fix for Epson 3490@2400 dpi
* backend/snapscan-options.c: Disable 2400 DPI for
Epson 3490, use 1600 DPI instead
2005-11-17 Gerhard Jaeger <gerhard@gjaeger.de>

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

@ -244,7 +244,7 @@ static void init_options (SnapScan_Scanner * ps)
static SANE_Word resolutions_2400[] =
{10, 50, 75, 100, 150, 200, 300, 400, 600, 1200, 2400};
static SANE_Word resolutions_3200[] =
{15, 50, 150, 200, 240, 266, 300, 350, 360, 400, 600, 720, 800, 1200, 2400, 3200};
{15, 50, 150, 200, 240, 266, 300, 350, 360, 400, 600, 720, 800, 1200, 1600, 3200};
static SANE_String_Const names_all[] =
{md_colour, md_bilevelcolour, md_greyscale, md_lineart, NULL};
static SANE_String_Const names_basic[] =
@ -1606,6 +1606,9 @@ SANE_Status sane_control_option (SANE_Handle h,
/*
* $Log$
* Revision 1.31 2005/11/17 23:47:10 oliver-guest
* Revert previous 'fix', disable 2400 dpi for Epson 3490, use 1600 dpi instead
*
* Revision 1.30 2005/11/15 20:11:18 oliver-guest
* Enabled quality calibration for the Epson 3490
*

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

@ -1159,7 +1159,7 @@ static SANE_Status calibrate_epson (SnapScan_Scanner *pss)
if (is_colour_mode(actual_mode(pss))) {
num_bins *= 3;
}
if (pss->res > (SANE_Int)pss->actual_res/2) {
if (pss->res >= (SANE_Int)pss->actual_res) {
num_bins *= 2;
}
@ -1483,6 +1483,9 @@ static SANE_Status download_firmware(SnapScan_Scanner * pss)
/*
* $Log$
* Revision 1.50 2005/11/17 23:47:10 oliver-guest
* Revert previous 'fix', disable 2400 dpi for Epson 3490, use 1600 dpi instead
*
* Revision 1.49 2005/11/17 23:32:22 oliver-guest
* Fixes for Epson 3490 @ 2400 DPI
*

21
backend/snapscan-sources.c
Wyświetl plik

@ -1155,9 +1155,9 @@ static SANE_Status create_source_chain (SnapScan_Scanner *pss,
some scanners like the Epson Perfection 2480/2580
at 2400 dpi. */
if (status == SANE_STATUS_GOOD &&
((pss->pdev->model == PERFECTION2480 && pss->res > 1200) ||
(pss->pdev->model == PERFECTION3490 && pss->res > 1600) ||
(pss->pdev->model == PRISA5000E && pss->res > 600)))
((pss->pdev->model == PERFECTION2480 && pss->res == 2400) ||
(pss->pdev->model == PERFECTION3490 && pss->res == 3200) ||
(pss->pdev->model == PRISA5000E && pss->res == 1200)))
status = create_Deinterlacer (pss, *pps, pps);
break;
case MD_BILEVELCOLOUR:
@ -1165,15 +1165,15 @@ static SANE_Status create_source_chain (SnapScan_Scanner *pss,
if (status == SANE_STATUS_GOOD)
status = create_RGBRouter (pss, *pps, pps);
if (status == SANE_STATUS_GOOD &&
((pss->pdev->model == PERFECTION2480 && pss->res > 1200) ||
(pss->pdev->model == PERFECTION3490 && pss->res > 1600) ||
(pss->pdev->model == PRISA5000E && pss->res > 600)))
((pss->pdev->model == PERFECTION2480 && pss->res == 2400) ||
(pss->pdev->model == PERFECTION3490 && pss->res == 3200) ||
(pss->pdev->model == PRISA5000E && pss->res == 1200)))
status = create_Deinterlacer (pss, *pps, pps);
break;
case MD_GREYSCALE:
if ((pss->pdev->model == PERFECTION2480 && pss->res > 1200) ||
(pss->pdev->model == PERFECTION3490 && pss->res > 1600) ||
(pss->pdev->model == PRISA5000E && pss->res > 600))
if ((pss->pdev->model == PERFECTION2480 && pss->res == 2400) ||
(pss->pdev->model == PERFECTION3490 && pss->res == 3200) ||
(pss->pdev->model == PRISA5000E && pss->res == 1200))
status = create_Deinterlacer (pss, *pps, pps);
break;
case MD_LINEART:
@ -1195,6 +1195,9 @@ static SANE_Status create_source_chain (SnapScan_Scanner *pss,
/*
* $Log$
* Revision 1.18 2005/11/17 23:47:11 oliver-guest
* Revert previous 'fix', disable 2400 dpi for Epson 3490, use 1600 dpi instead
*
* Revision 1.17 2005/11/17 23:32:23 oliver-guest
* Fixes for Epson 3490 @ 2400 DPI
*