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

Fixed off-by-one error in color re-ordering

DEVEL_2_0_BRANCH-1
Karl Heinz Kremer 2000-12-03 16:31:46 +00:00
rodzic 251c293494
commit 29a18dce83
1 zmienionych plików z 30 dodań i 12 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

44
backend/epson.c
Wyświetl plik

@ -16,7 +16,7 @@
*/ */
#define SANE_EPSON_VERSION "SANE Epson Backend v0.1.36 - 2000-12-02" #define SANE_EPSON_VERSION "SANE Epson Backend v0.1.37 - 2000-12-03"
/* /*
This file is part of the SANE package. This file is part of the SANE package.
@ -58,6 +58,7 @@
If you do not wish that, delete this exception notice. */ If you do not wish that, delete this exception notice. */
/* /*
2000-12-03 Fixed off-by-one error in color reordering function.
2000-12-02 Read information about optical resolution and line 2000-12-02 Read information about optical resolution and line
distance from scanner instead of hardcoded values. distance from scanner instead of hardcoded values.
Add support for color depth > 8 bits per channel. Add support for color depth > 8 bits per channel.
@ -4521,33 +4522,50 @@ START_READ:
* are doing this here: * are doing this here:
*/ */
/*
* HACK !!!
* The Perfection 1640 seems to have the R and G channels swapped. At
* this time this is the only 14 bit scanner, so I'm using this information
* to reverse the re-order rule.
* This has to be checked again after new 14bit scanners are released !!!
*/
if (s->hw->maxDepth == 14)
reorder = !reorder; /* !!! */
if (reorder) if (reorder)
{ {
SANE_Byte *ptr; SANE_Byte *ptr;
for (ptr = s->buf; ptr < s->end; ptr++) ptr = s->buf;
while (ptr < s->end)
{ {
if (s->params.depth > 8) if (s->params.depth > 8)
{ {
/* R->G G->R */ SANE_Byte tmp;
SANE_Word tmp;
tmp = (SANE_Word) *ptr; /* R->G G->R */
(SANE_Word) *ptr = (SANE_Word) *(ptr+2); /* G */ tmp = ptr[0];
(SANE_Word) *(ptr+2) = tmp; /* R */ ptr[0] = ptr[2]; /* first Byte G */
/* B stays the same */ ptr[2] = tmp; /* first Byte R */
ptr += 6; /* go to next */
tmp = ptr[1];
ptr[1] = ptr[3]; /* second Byte G */
ptr[3] = tmp; /* second Byte R */
ptr += 6; /* go to next pixel */
} }
else else
{ {
/* R->G G->R */ /* R->G G->R */
SANE_Byte tmp; SANE_Byte tmp;
tmp = *ptr; tmp = ptr[0];
*ptr = *(ptr+1); /* G */ ptr[0] = ptr[1]; /* G */
*(ptr+1) = tmp; /* R */ ptr[1] = tmp; /* R */
/* B stays the same */ /* B stays the same */
ptr += 3; /* go to next */ ptr += 3; /* go to next pixel */
} }
} }
} }