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

- removed now unneeded #ifdef in gl646_send_gamma_table

merge-requests/1/head
Stéphane Voltz 2006-03-13 14:55:36 +00:00
rodzic e857486bf9
commit b3b4b3719b
2 zmienionych plików z 5 dodań i 32 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 @@
2006-03-12 Stéphane Voltz <stefdev@modulonet.fr>
* backend/genesys_gl646.c: removed now unneeded #ifdef in
gl646_send_gamma_table.
2006-03-12 Pierre Willenbrock <pierre@pirsoft.dnsalias.org> 2006-03-12 Pierre Willenbrock <pierre@pirsoft.dnsalias.org>
* backend/genesys_gl646.c: fixed silly thinko in * backend/genesys_gl646.c: fixed silly thinko in

32
backend/genesys_gl646.c
Wyświetl plik

@ -3120,11 +3120,7 @@ gl646_send_gamma_table (Genesys_Device * dev, SANE_Bool generic)
int size; int size;
int address; int address;
int status; int status;
#ifdef WORDS_BIGENDIAN
u_int8_t *gamma; u_int8_t *gamma;
#else
u_int16_t *gamma;
#endif
int i; int i;
/* don't send anything if no specific gamma table defined */ /* don't send anything if no specific gamma table defined */
@ -3159,7 +3155,6 @@ gl646_send_gamma_table (Genesys_Device * dev, SANE_Bool generic)
return SANE_STATUS_INVAL; return SANE_STATUS_INVAL;
} }
#ifdef WORDS_BIGENDIAN
/* allocate temporary gamma tables: 16 bits words, 3 channels */ /* allocate temporary gamma tables: 16 bits words, 3 channels */
gamma = (u_int8_t *) malloc (size * 2 * 3); gamma = (u_int8_t *) malloc (size * 2 * 3);
if (!gamma) if (!gamma)
@ -3191,33 +3186,6 @@ gl646_send_gamma_table (Genesys_Device * dev, SANE_Bool generic)
gamma[i * 2 + 1 + size * 4] = dev->sensor.blue_gamma_table[i] >> 8; gamma[i * 2 + 1 + size * 4] = dev->sensor.blue_gamma_table[i] >> 8;
} }
} }
#else
/* allocate temporary gamma tables: 16 bits words, 3 channels */
gamma = (u_int16_t *) malloc (size * 2 * 3);
if (!gamma)
return SANE_STATUS_NO_MEM;
/* take care off generic/specific data */
if (generic)
{
/* fill with default values */
for (i = 0; i < size; i++)
{
gamma[i] = i ;
gamma[i + size] = i ;
gamma[i + size * 2] = i ;
}
}
else
{
/* copy sensor specific's gamma tables */
for (i = 0; i < size; i++)
{
gamma[i] = dev->sensor.red_gamma_table[i];
gamma[i + size ] = dev->sensor.green_gamma_table[i];
gamma[i + size * 2] = dev->sensor.blue_gamma_table[i];
}
}
#endif
/* send address */ /* send address */
status = sanei_genesys_set_buffer_address (dev, address); status = sanei_genesys_set_buffer_address (dev, address);