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

genesys: Properly use 16-bit data when calibrating

merge-requests/191/head
Povilas Kanapickas 2019-09-16 09:50:11 +03:00
rodzic 32c49e5ec1
commit b58192493e
3 zmienionych plików z 11 dodań i 13 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

20
backend/genesys.cc
Wyświetl plik

@ -1560,7 +1560,7 @@ static void genesys_coarse_calibration(Genesys_Device* dev, Genesys_Sensor& sens
average_data and calibration_data are little endian 16 bit words. average_data and calibration_data are little endian 16 bit words.
*/ */
static void genesys_average_data(uint16_t* average_data, static void genesys_average_data(uint16_t* average_data,
uint8_t * calibration_data, const std::uint16_t* calibration_data,
uint32_t lines, uint32_t lines,
uint32_t pixel_components_per_line) uint32_t pixel_components_per_line)
{ {
@ -1571,11 +1571,8 @@ static void genesys_average_data(uint16_t* average_data,
{ {
sum = 0; sum = 0;
for (y = 0; y < lines; y++) for (y = 0; y < lines; y++)
{ {
sum += calibration_data[(x + y * pixel_components_per_line) * 2]; sum += calibration_data[(x + y * pixel_components_per_line)];
sum +=
calibration_data[(x + y * pixel_components_per_line) * 2 +
1] * 256;
} }
sum /= lines; sum /= lines;
*average_data++ = sum; *average_data++ = sum;
@ -1625,7 +1622,7 @@ static void genesys_shading_calibration_impl(Genesys_Device* dev, const Genesys_
size = channels * 2 * pixels_per_line * (dev->calib_lines + 1); size = channels * 2 * pixels_per_line * (dev->calib_lines + 1);
} }
std::vector<uint8_t> calibration_data(size); std::vector<uint16_t> calibration_data(size / 2);
motor=SANE_TRUE; motor=SANE_TRUE;
if (dev->model->flags & GENESYS_FLAG_SHADING_NO_MOVE) if (dev->model->flags & GENESYS_FLAG_SHADING_NO_MOVE)
@ -1656,7 +1653,8 @@ static void genesys_shading_calibration_impl(Genesys_Device* dev, const Genesys_
dev->cmd_set->begin_scan(dev, sensor, &dev->calib_reg, is_dark ? SANE_FALSE : SANE_TRUE); dev->cmd_set->begin_scan(dev, sensor, &dev->calib_reg, is_dark ? SANE_FALSE : SANE_TRUE);
sanei_genesys_read_data_from_scanner(dev, calibration_data.data(), size); sanei_genesys_read_data_from_scanner(dev, reinterpret_cast<std::uint8_t*>(calibration_data.data()),
size);
dev->cmd_set->end_scan(dev, &dev->calib_reg, SANE_TRUE); dev->cmd_set->end_scan(dev, &dev->calib_reg, SANE_TRUE);
@ -1667,9 +1665,9 @@ static void genesys_shading_calibration_impl(Genesys_Device* dev, const Genesys_
calibration_data.data(), dev->calib_lines, pixels_per_line * channels); calibration_data.data(), dev->calib_lines, pixels_per_line * channels);
if (DBG_LEVEL >= DBG_data) { if (DBG_LEVEL >= DBG_data) {
sanei_genesys_write_pnm_file((log_filename_prefix + "_shading.pnm").c_str(), sanei_genesys_write_pnm_file16((log_filename_prefix + "_shading.pnm").c_str(),
calibration_data.data(), 16, calibration_data.data(),
channels, pixels_per_line, dev->calib_lines); channels, pixels_per_line, dev->calib_lines);
sanei_genesys_write_pnm_file16((log_filename_prefix + "_average.pnm").c_str(), sanei_genesys_write_pnm_file16((log_filename_prefix + "_average.pnm").c_str(),
out_average_data.data(), out_average_data.data(),
channels, out_pixels_per_line, 1); channels, out_pixels_per_line, 1);

2
backend/genesys_low.cc
Wyświetl plik

@ -159,7 +159,7 @@ void sanei_genesys_write_pnm_file(const char* filename, uint8_t* data, int depth
fclose (out); fclose (out);
} }
void sanei_genesys_write_pnm_file16(const char* filename, uint16_t* data, unsigned channels, void sanei_genesys_write_pnm_file16(const char* filename, const uint16_t* data, unsigned channels,
unsigned pixels_per_line, unsigned lines) unsigned pixels_per_line, unsigned lines)
{ {
DBG_HELPER_ARGS(dbg, "channels=%d, ppl=%d, lines=%d", channels, DBG_HELPER_ARGS(dbg, "channels=%d, ppl=%d, lines=%d", channels,

2
backend/genesys_low.h
Wyświetl plik

@ -531,7 +531,7 @@ extern void sanei_genesys_write_file(const char* filename, uint8_t* data, size_t
extern void sanei_genesys_write_pnm_file(const char* filename, uint8_t* data, int depth, extern void sanei_genesys_write_pnm_file(const char* filename, uint8_t* data, int depth,
int channels, int pixels_per_line, int lines); int channels, int pixels_per_line, int lines);
extern void sanei_genesys_write_pnm_file16(const char* filename, uint16_t* data, unsigned channels, extern void sanei_genesys_write_pnm_file16(const char* filename, const uint16_t *data, unsigned channels,
unsigned pixels_per_line, unsigned lines); unsigned pixels_per_line, unsigned lines);
extern void sanei_genesys_test_buffer_empty(Genesys_Device* dev, SANE_Bool* empty); extern void sanei_genesys_test_buffer_empty(Genesys_Device* dev, SANE_Bool* empty);