genesys: Remove unused code

merge-requests/106/head
Povilas Kanapickas 2019-08-02 22:31:58 +03:00
rodzic 13b2d09a42
commit 3c6635559f
3 zmienionych plików z 2 dodań i 49 usunięć

Wyświetl plik

@ -1573,47 +1573,6 @@ static void genesys_coarse_calibration(Genesys_Device* dev, Genesys_Sensor& sens
dark[i * 3 + 0] = dark[i * 3 + 1] = dark[i * 3 + 2] =
genesys_average_black (dev, 0, calibration_data.data(), black_pixels);
}
if (i == 3)
{
if (dev->settings.scan_mode == ScanColorMode::COLOR_SINGLE_PASS)
{
/* todo: huh? */
dev->dark[0] =
(uint16_t) (1.6925 * dark[i * 3 + 0] + 0.1895 * 256);
dev->dark[1] =
(uint16_t) (1.4013 * dark[i * 3 + 1] + 0.3147 * 256);
dev->dark[2] =
(uint16_t) (1.2931 * dark[i * 3 + 2] + 0.1558 * 256);
}
else /* one color-component modes */
{
switch (dev->settings.color_filter)
{
case ColorFilter::RED:
default:
dev->dark[0] =
(uint16_t) (1.6925 * dark[i * 3 + 0] +
(1.1895 - 1.0) * 256);
dev->dark[1] = dev->dark[2] = dev->dark[0];
break;
case ColorFilter::GREEN:
dev->dark[1] =
(uint16_t) (1.4013 * dark[i * 3 + 1] +
(1.3147 - 1.0) * 256);
dev->dark[0] = dev->dark[2] = dev->dark[1];
break;
case ColorFilter::BLUE:
dev->dark[2] =
(uint16_t) (1.2931 * dark[i * 3 + 2] +
(1.1558 - 1.0) * 256);
dev->dark[0] = dev->dark[1] = dev->dark[2];
break;
}
}
}
} /* for (i = 0; i < 4; i++) */
DBG(DBG_info, "%s: final: gain: %d/%d/%d, offset: %d/%d/%d\n", __func__,

Wyświetl plik

@ -3291,7 +3291,6 @@ static void gl646_init(Genesys_Device* dev)
DBG_INIT();
DBG_HELPER(dbg);
struct timeval tv;
uint8_t cold = 0, val = 0;
uint32_t addr = 0xdead;
size_t len;
@ -3319,8 +3318,6 @@ static void gl646_init(Genesys_Device* dev)
dev->white_average_data.clear();
dev->settings.color_filter = ColorFilter::GREEN;
gettimeofday (&tv, NULL);
dev->init_date = tv.tv_sec;
/* Set default values for registers */
gl646_init_regs (dev);

Wyświetl plik

@ -1568,7 +1568,6 @@ struct Genesys_Device
Genesys_Gpo gpo;
Genesys_Motor motor;
uint8_t control[6] = {};
time_t init_date = 0;
size_t average_size = 0;
// number of pixels used during shading calibration
@ -1590,11 +1589,9 @@ struct Genesys_Device
std::vector<uint8_t> white_average_data;
std::vector<uint8_t> dark_average_data;
uint16_t dark[3] = {};
SANE_Bool already_initialized = 0;
SANE_Int scanhead_position_in_steps = 0;
SANE_Int lamp_off_time = 0;
SANE_Bool read_active = 0;
// signal wether the park command has been issued
@ -1611,9 +1608,9 @@ struct Genesys_Device
Genesys_Buffer out_buffer;
// buffer for digital lineart from gray data
Genesys_Buffer binarize_buffer = {};
Genesys_Buffer binarize_buffer;
// local buffer for gray data during dynamix lineart
Genesys_Buffer local_buffer = {};
Genesys_Buffer local_buffer;
// bytes to read from scanner
size_t read_bytes_left = 0;