genesys: Remove read buffer after image processing

backend/genesys/device.cpp

@@ -102,7 +102,6 @@ Genesys_Device::~Genesys_Device()
 
 void Genesys_Device::clear()
 {
-    read_buffer.clear();
     binarize_buffer.clear();
     local_buffer.clear();
 
@@ -258,7 +257,6 @@ std::ostream& operator<<(std::ostream& out, const Genesys_Device& dev)
         << "    read_active: " << dev.read_active << '\n'
         << "    parking: " << dev.parking << '\n'
         << "    document: " << dev.document << '\n'
-        << "    read_buffer.size(): " << dev.read_buffer.size() << '\n'
         << "    binarize_buffer.size(): " << dev.binarize_buffer.size() << '\n'
         << "    local_buffer.size(): " << dev.local_buffer.size() << '\n'
         << "    total_bytes_read: " << dev.total_bytes_read << '\n'

backend/genesys/device.h

@@ -318,8 +318,6 @@ struct Genesys_Device
     // for sheetfed scanner's, is TRUE when there is a document in the scanner
     bool document = false;
 
-    Genesys_Buffer read_buffer;
-
     // buffer for digital lineart from gray data
     Genesys_Buffer binarize_buffer;
     // local buffer for gray data during dynamix lineart

backend/genesys/genesys.cpp

@@ -4113,7 +4113,6 @@ static void genesys_read_ordered_data(Genesys_Device* dev, SANE_Byte* destinatio
 {
     DBG_HELPER(dbg);
     size_t bytes = 0;
-  uint8_t *work_buffer_src;
 
     if (!dev->read_active) {
       *len = 0;
@@ -4148,28 +4147,12 @@ static void genesys_read_ordered_data(Genesys_Device* dev, SANE_Byte* destinatio
             dev->cmd_set->detect_document_end(dev);
         }
 
-        std::size_t size = dev->read_buffer.size() - dev->read_buffer.avail();
-
-        dev->pipeline_buffer.get_data(size, dev->read_buffer.get_write_pos(size));
-        dev->read_buffer.produce(size);
-
-        bytes = std::min(dev->read_buffer.avail(), *len);
-
-        work_buffer_src = dev->read_buffer.get_read_pos();
-
-        std::memcpy(destination, work_buffer_src, bytes);
-        *len = bytes;
-
-        /* avoid signaling some extra data because we have treated a full block
-        * on the last block */
         if (dev->total_bytes_read + *len > dev->total_bytes_to_read) {
             *len = dev->total_bytes_to_read - dev->total_bytes_read;
         }
 
-        /* count bytes sent to frontend */
+        dev->pipeline_buffer.get_data(*len, destination);
         dev->total_bytes_read += *len;
-
-        dev->read_buffer.consume(bytes);
     }
 
   /* end scan if all needed data have been read */

backend/genesys/gl124.cpp

@@ -776,9 +776,6 @@ void CommandSetGl124::init_regs_for_scan_session(Genesys_Device* dev, const Gene
 
   /*** prepares data reordering ***/
 
-    dev->read_buffer.clear();
-    dev->read_buffer.alloc(session.buffer_size_read);
-
     dev->read_active = true;
 
     dev->session = session;

backend/genesys/gl646.cpp

@@ -840,9 +840,6 @@ void CommandSetGl646::init_regs_for_scan_session(Genesys_Device* dev, const Gene
     // setup analog frontend
     gl646_set_fe(dev, sensor, AFE_SET, session.output_resolution);
 
-    dev->read_buffer.clear();
-    dev->read_buffer.alloc(session.buffer_size_read);
-
     build_image_pipeline(dev, session);
 
     dev->read_active = true;

backend/genesys/gl841.cpp

@@ -1056,9 +1056,6 @@ dummy \ scanned lines
                                    session.params.flags);
   }
 
-    dev->read_buffer.clear();
-    dev->read_buffer.alloc(session.buffer_size_read);
-
     build_image_pipeline(dev, session);
 
     dev->read_active = true;

backend/genesys/gl842.cpp

@@ -521,9 +521,6 @@ void CommandSetGl842::init_regs_for_scan_session(Genesys_Device* dev, const Gene
                                session.optical_line_count, dummy, session.params.starty,
                                session.params.flags);
 
-    dev->read_buffer.clear();
-    dev->read_buffer.alloc(session.buffer_size_read);
-
     build_image_pipeline(dev, session);
 
     dev->read_active = true;

backend/genesys/gl843.cpp

@@ -1054,9 +1054,6 @@ void CommandSetGl843::init_regs_for_scan_session(Genesys_Device* dev, const Gene
                                session.optical_line_count, dummy, session.params.starty,
                                session.params.flags);
 
-    dev->read_buffer.clear();
-    dev->read_buffer.alloc(session.buffer_size_read);
-
     build_image_pipeline(dev, session);
 
     dev->read_active = true;

backend/genesys/gl846.cpp

@@ -693,9 +693,6 @@ void CommandSetGl846::init_regs_for_scan_session(Genesys_Device* dev, const Gene
 
   /*** prepares data reordering ***/
 
-    dev->read_buffer.clear();
-    dev->read_buffer.alloc(session.buffer_size_read);
-
     dev->read_active = true;
 
     dev->session = session;

backend/genesys/gl847.cpp

@@ -569,9 +569,6 @@ void CommandSetGl847::init_regs_for_scan_session(Genesys_Device* dev, const Gene
                                session.optical_line_count, dummy, session.params.starty,
                                session.params.flags);
 
-    dev->read_buffer.clear();
-    dev->read_buffer.alloc(session.buffer_size_read);
-
     dev->read_active = true;
 
     dev->session = session;