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

adapting gamma conversion

merge-requests/1/head
Ullrich Sigwanz 2004-10-14 12:04:28 +00:00
rodzic b53e319c30
commit 2c9973603e
2 zmienionych plików z 26 dodań i 17 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

5
ChangeLog
Wyświetl plik

@ -1,3 +1,8 @@
2004-10-14 Ullrich Sigwanz <usigwanz@freesurf.ch>
* backend/niash.c: removing a non-ANSI conform comma.
adapting the gammma conversion.
2004-10-14 Gerhard Jaeger <gerhard@gjaeger.de> 2004-10-14 Gerhard Jaeger <gerhard@gjaeger.de>
* sanei/sanei_thread.c: Added missing pthread_detach() so the * sanei/sanei_thread.c: Added missing pthread_detach() so the

38
backend/niash.c
Wyświetl plik

@ -155,32 +155,32 @@ static const SANE_Range rangeGamma = { SANE_FIX (0.25), SANE_FIX (4.0),
SANE_FIX (0.0) SANE_FIX (0.0)
}; };
/* interpolate a sane gamma table to a hardware appropriate one */ /* interpolate a sane gamma table to a hardware appropriate one
just in case the sane gamma table would be smaller */
static void static void
_ConvertGammaTable (SANE_Word * saneGamma, unsigned char *hwGamma) _ConvertGammaTable (SANE_Word * saneGamma, unsigned char *hwGamma)
{ {
int i; int i;
int current = 0;
for (i = 0; i < SANE_GAMMA_SIZE; ++i) for (i = 0; i < SANE_GAMMA_SIZE; ++i)
{ {
int j; int j;
int current, next; int next;
current = (i * HW_GAMMA_SIZE) / SANE_GAMMA_SIZE; /* highest range of copy indices */
next = ((i + 1) * HW_GAMMA_SIZE) / SANE_GAMMA_SIZE; next = ((i + 1) * HW_GAMMA_SIZE) / SANE_GAMMA_SIZE;
for (j = current; j < HW_GAMMA_SIZE && j < next; ++j) /* always copy the first */
hwGamma[current] = saneGamma[i];
/* the interpolation of the rest depends on the gap */
for (j = current + 1; j < HW_GAMMA_SIZE && j < next; ++j)
{ {
if (j == current) hwGamma[j] =
{ (saneGamma[i] * (next - j) +
hwGamma[j] = saneGamma[i]; saneGamma[i + 1] * (j - current)) / (next - current);
}
else
{
hwGamma[j] =
(saneGamma[i] * (next - j) +
saneGamma[i + 1] * (j - current)) / (next - current);
}
} }
current = next;
} }
} }
@ -296,6 +296,10 @@ _rgb2gray (unsigned char *buffer, int pixels, int threshold)
acc = 0; acc = 0;
} }
} }
#undef WEIGHT_R
#undef WEIGHT_G
#undef WEIGHT_B
#undef WEIGHT_W
} }
/* convert 24bit RGB to 1bit B/W */ /* convert 24bit RGB to 1bit B/W */
@ -303,7 +307,7 @@ static void
_rgb2lineart (unsigned char *buffer, int pixels, int threshold) _rgb2lineart (unsigned char *buffer, int pixels, int threshold)
{ {
static const int aMask[BITS_PER_BYTE] = { 128, 64, 32, 16, 8, 4, 2, 1 }; static const int aMask[BITS_PER_BYTE] = { 128, 64, 32, 16, 8, 4, 2, 1 };
unsigned char acc = 0; int acc = 0;
int nx; int nx;
int x; int x;
int thresh; int thresh;
@ -336,7 +340,7 @@ typedef struct tgModeParam
static const TModeParam modeParam[] = { static const TModeParam modeParam[] = {
{DEPTH_COLOR, SANE_FRAME_RGB, _bytesPerLineColor, _rgb2rgb}, {DEPTH_COLOR, SANE_FRAME_RGB, _bytesPerLineColor, _rgb2rgb},
{DEPTH_GRAY, SANE_FRAME_GRAY, _bytesPerLineGray, _rgb2gray}, {DEPTH_GRAY, SANE_FRAME_GRAY, _bytesPerLineGray, _rgb2gray},
{DEPTH_LINEART, SANE_FRAME_GRAY, _bytesPerLineLineart, _rgb2lineart}, {DEPTH_LINEART, SANE_FRAME_GRAY, _bytesPerLineLineart, _rgb2lineart}
}; };
@ -759,7 +763,7 @@ _InitOptions (TScanner * s)
pDesc->title = SANE_TITLE_THRESHOLD; pDesc->title = SANE_TITLE_THRESHOLD;
pDesc->desc = SANE_DESC_THRESHOLD; pDesc->desc = SANE_DESC_THRESHOLD;
pDesc->type = SANE_TYPE_INT; pDesc->type = SANE_TYPE_INT;
pDesc->unit = SANE_UNIT_NONE; pDesc->unit = SANE_UNIT_PERCENT;
pDesc->constraint_type = SANE_CONSTRAINT_RANGE; pDesc->constraint_type = SANE_CONSTRAINT_RANGE;
pDesc->constraint.range = &rangeThreshold; pDesc->constraint.range = &rangeThreshold;
pDesc->cap = pDesc->cap =