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

genesys: Reindent genesys_fill_segmented_buffer()

merge-requests/172/head
Povilas Kanapickas 2019-09-12 22:39:21 +03:00
rodzic c2c65f29c9
commit 502478a40d
1 zmienionych plików z 60 dodań i 53 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

39
backend/genesys.cc
Wyświetl plik

@ -3456,14 +3456,15 @@ static void genesys_fill_segmented_buffer(Genesys_Device* dev, uint8_t* work_buf
size_t size)
{
DBG_HELPER(dbg);
size_t count;
int depth, k;
depth = dev->settings.depth;
if (dev->settings.scan_mode == ScanColorMode::LINEART && dev->settings.dynamic_lineart==SANE_FALSE)
unsigned depth = dev->settings.depth;
if (dev->settings.scan_mode == ScanColorMode::LINEART &&
dev->settings.dynamic_lineart == false)
{
depth = 1;
}
/* fill buffer if needed */
// fill buffer if needed
if (dev->oe_buffer.avail() == 0)
{
accurate_line_read(dev, dev->oe_buffer);
@ -3476,19 +3477,20 @@ static void genesys_fill_segmented_buffer(Genesys_Device* dev, uint8_t* work_buf
return dev->oe_buffer.get_read_pos()[curr_byte];
};
/* copy size bytes of data, copying from a subwindow of each line
* when last line of buffer is exhausted, read another one */
count = 0;
while (count < size)
{
// copy size bytes of data, copying from a subwindow of each line
// when last line of buffer is exhausted, read another one
size_t count = 0;
while (count < size) {
if (depth == 1) {
while (dev->deseg_curr_byte < dev->session.output_segment_pixel_group_count && count < size) {
while (dev->deseg_curr_byte < dev->session.output_segment_pixel_group_count &&
count < size)
{
for (unsigned n = 0; n < dev->session.segment_count; n++) {
work_buffer_dst[count + n] = 0;
}
/* interleaving is at bit level */
for (unsigned i = 0; i < 8; i++) {
k = count + (i * dev->session.segment_count) / 8;
unsigned k = count + (i * dev->session.segment_count) / 8;
for (unsigned n = 0; n < dev->session.segment_count; n++) {
work_buffer_dst[k] = work_buffer_dst[k] << 1;
if (read_desegmented(dev->deseg_curr_byte, n) & (0x80 >> i)) {
@ -3502,8 +3504,11 @@ static void genesys_fill_segmented_buffer(Genesys_Device* dev, uint8_t* work_buf
dev->deseg_curr_byte++;
}
}
if (depth == 8) {
while (dev->deseg_curr_byte < dev->session.output_segment_pixel_group_count && count < size) {
while (dev->deseg_curr_byte < dev->session.output_segment_pixel_group_count &&
count < size)
{
for (unsigned n = 0; n < dev->session.segment_count; n++) {
work_buffer_dst[count + n] = read_desegmented(dev->deseg_curr_byte, n);
}
@ -3512,8 +3517,10 @@ static void genesys_fill_segmented_buffer(Genesys_Device* dev, uint8_t* work_buf
dev->deseg_curr_byte++;
}
}
if (depth == 16) {
while (dev->deseg_curr_byte < dev->session.output_segment_pixel_group_count && count < size) {
while (dev->deseg_curr_byte < dev->session.output_segment_pixel_group_count &&
count < size) {
for (unsigned n = 0; n < dev->session.segment_count; n++) {
work_buffer_dst[count + n * 2] = read_desegmented(dev->deseg_curr_byte, n);
work_buffer_dst[count + n * 2 + 1] = read_desegmented(dev->deseg_curr_byte + 1, n);
@ -3524,13 +3531,13 @@ static void genesys_fill_segmented_buffer(Genesys_Device* dev, uint8_t* work_buf
}
}
/* go to next line if needed */
// go to next line if needed
if (dev->deseg_curr_byte == dev->session.output_segment_pixel_group_count) {
dev->oe_buffer.set_pos(dev->oe_buffer.pos() + dev->session.output_line_bytes_raw);
dev->deseg_curr_byte = 0;
}
/* read a new buffer if needed */
// read a new buffer if needed
if (dev->oe_buffer.pos() >= dev->oe_buffer.avail())
{
accurate_line_read(dev, dev->oe_buffer);