genesys: Rename ScanSession::output_{line_channel => channel}_bytes

backend/genesys_gl646.cc

@@ -563,7 +563,7 @@ static void gl646_setup_registers(Genesys_Device* dev,
     DBG(DBG_info, "%s: startx=%d, endx=%d, ccd_size_divisor=%d\n", __func__, sx, ex,
         session.ccd_size_divisor);
 
-    dev->bpl = session.output_line_channel_bytes;
+    dev->bpl = session.output_channel_bytes;
     dev->wpl = session.output_line_bytes;
 
     regs->set24(REG_MAXWD, session.output_line_bytes);

backend/genesys_gl843.cc

@@ -1157,8 +1157,8 @@ static void gl843_init_optical_regs_scan(Genesys_Device* dev, const Genesys_Sens
     reg->set16(REG_STRPIXEL, session.pixel_startx);
     reg->set16(REG_ENDPIXEL, session.pixel_endx);
 
-    dev->wpl = session.output_line_channel_bytes; // FIXME: this is not currently used
-    dev->bpl = session.output_line_channel_bytes; // FIXME: this is not currently used
+    dev->wpl = session.output_channel_bytes; // FIXME: this is not currently used
+    dev->bpl = session.output_channel_bytes; // FIXME: this is not currently used
 
   DBG(DBG_io2, "%s: pixels     =%d\n", __func__, session.optical_pixels);
   DBG(DBG_io2, "%s: depth      =%d\n", __func__, session.params.depth);

backend/genesys_low.cc

@@ -1280,8 +1280,8 @@ void compute_session(Genesys_Device* dev, ScanSession& s, const Genesys_Sensor&
 
     s.output_line_count = s.params.lines + s.max_color_shift_lines + s.num_staggered_lines;
 
-    s.output_line_channel_bytes = multiply_by_depth_ceil(s.output_pixels, s.params.depth);
-    s.output_line_bytes = s.output_line_channel_bytes * s.params.channels;
+    s.output_channel_bytes = multiply_by_depth_ceil(s.output_pixels, s.params.depth);
+    s.output_line_bytes = s.output_channel_bytes * s.params.channels;
 
     compute_session_buffer_sizes(dev->model->asic_type, s);
 }

backend/genesys_settings.h

@@ -238,7 +238,7 @@ struct ScanSession {
     unsigned output_pixels = 0;
 
     // the number of bytes in the output of a channel of a single line
-    unsigned output_line_channel_bytes;
+    unsigned output_channel_bytes = 0;
 
     // the number of bytes in the output of a single line
     unsigned output_line_bytes = 0;