From b3b4b3719b6a26e38b42c82a424c92d61a800310 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Voltz?= Date: Mon, 13 Mar 2006 14:55:36 +0000 Subject: [PATCH] - removed now unneeded #ifdef in gl646_send_gamma_table --- ChangeLog | 5 +++++ backend/genesys_gl646.c | 32 -------------------------------- 2 files changed, 5 insertions(+), 32 deletions(-) diff --git a/ChangeLog b/ChangeLog index 62a3a7a2d..5fb422791 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-03-12 Stéphane Voltz + + * backend/genesys_gl646.c: removed now unneeded #ifdef in + gl646_send_gamma_table. + 2006-03-12 Pierre Willenbrock * backend/genesys_gl646.c: fixed silly thinko in diff --git a/backend/genesys_gl646.c b/backend/genesys_gl646.c index b00fe7ec6..ad77d5507 100644 --- a/backend/genesys_gl646.c +++ b/backend/genesys_gl646.c @@ -3120,11 +3120,7 @@ gl646_send_gamma_table (Genesys_Device * dev, SANE_Bool generic) int size; int address; int status; -#ifdef WORDS_BIGENDIAN u_int8_t *gamma; -#else - u_int16_t *gamma; -#endif int i; /* 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; } -#ifdef WORDS_BIGENDIAN /* allocate temporary gamma tables: 16 bits words, 3 channels */ gamma = (u_int8_t *) malloc (size * 2 * 3); 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; } } -#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 */ status = sanei_genesys_set_buffer_address (dev, address);