Merge branch 'release/debian/1.2.1-1'debian/1.2.1-1

1 files changed, 18 insertions, 19 deletions

diff --git a/backend/genesys/gl124.cpp b/backend/genesys/gl124.cpp
index 1fa4d99..af193a3 100644
--- a/backend/genesys/gl124.cpp
+++ b/backend/genesys/gl124.cpp
@@ -355,7 +355,7 @@ gl124_init_registers (Genesys_Device * dev)
  * @param dev device owning the AFE
  * @param set flag AFE_INIT to specify the AFE must be reset before writing data
  * */
-static void gl124_set_ti_fe(Genesys_Device* dev, uint8_t set)
+static void gl124_set_ti_fe(Genesys_Device* dev, std::uint8_t set)
 {
     DBG_HELPER(dbg);
   int i;
@@ -367,9 +367,8 @@ static void gl124_set_ti_fe(Genesys_Device* dev, uint8_t set)
     // start writing to DAC
     dev->interface->write_fe_register(0x00, 0x80);
 
-  /* write values to analog frontend */
-  for (uint16_t addr = 0x01; addr < 0x04; addr++)
-    {
+    // write values to analog frontend
+    for (std::uint16_t addr = 0x01; addr < 0x04; addr++) {
         dev->interface->write_fe_register(addr, dev->frontend.regs.get_value(addr));
     }
 
@@ -392,13 +391,14 @@ static void gl124_set_ti_fe(Genesys_Device* dev, uint8_t set)
 
 
 // Set values of analog frontend
-void CommandSetGl124::set_fe(Genesys_Device* dev, const Genesys_Sensor& sensor, uint8_t set) const
+void CommandSetGl124::set_fe(Genesys_Device* dev, const Genesys_Sensor& sensor,
+                             std::uint8_t set) const
 {
     DBG_HELPER_ARGS(dbg, "%s", set == AFE_INIT ? "init" :
                                set == AFE_SET ? "set" :
                                set == AFE_POWER_SAVE ? "powersave" : "huh?");
     (void) sensor;
-  uint8_t val;
+    std::uint8_t val;
 
     if (set == AFE_INIT) {
         dev->frontend = dev->frontend_initial;
@@ -434,7 +434,7 @@ static void gl124_init_motor_regs_scan(Genesys_Device* dev,
     DBG_HELPER(dbg);
   unsigned int lincnt, fast_dpi;
   unsigned int feedl,dist;
-  uint32_t z1, z2;
+    std::uint32_t z1, z2;
     unsigned yres;
     unsigned min_speed;
   unsigned int linesel;
@@ -489,7 +489,7 @@ static void gl124_init_motor_regs_scan(Genesys_Device* dev,
     reg->set24(REG_LINCNT, lincnt);
 
   /* compute register 02 value */
-    uint8_t r02 = REG_0x02_NOTHOME;
+    std::uint8_t r02 = REG_0x02_NOTHOME;
 
     if (has_flag(flags, ScanFlag::AUTO_GO_HOME)) {
         r02 |= REG_0x02_AGOHOME;
@@ -578,7 +578,6 @@ static void gl124_init_optical_regs_scan(Genesys_Device* dev, const Genesys_Sens
                                          const ScanSession& session)
 {
     DBG_HELPER_ARGS(dbg, "exposure_time=%d", exposure_time);
-  uint32_t expmax;
 
     scanner_setup_sensor(*dev, sensor, *reg);
 
@@ -659,7 +658,7 @@ static void gl124_init_optical_regs_scan(Genesys_Device* dev, const Genesys_Sens
         reg->find_reg(REG_0x60).value &= ~REG_0x60_LEDADD;
         if (session.enable_ledadd) {
             reg->find_reg(REG_0x60).value |= REG_0x60_LEDADD;
-            expmax = reg->get24(REG_EXPR);
+            std::uint32_t expmax = reg->get24(REG_EXPR);
             expmax = std::max(expmax, reg->get24(REG_EXPG));
             expmax = std::max(expmax, reg->get24(REG_EXPB));
 
@@ -745,7 +744,7 @@ void CommandSetGl124::init_regs_for_scan_session(Genesys_Device* dev, const Gene
     dev->session = session;
 
     dev->total_bytes_read = 0;
-    dev->total_bytes_to_read = session.output_line_bytes_requested * session.params.lines;
+    dev->total_bytes_to_read = (size_t)session.output_line_bytes_requested * (size_t)session.params.lines;
 
     DBG(DBG_info, "%s: total bytes to send to frontend = %zu\n", __func__,
         dev->total_bytes_to_read);
@@ -826,7 +825,7 @@ void gl124_setup_scan_gpio(Genesys_Device* dev, int resolution)
 {
     DBG_HELPER(dbg);
 
-    uint8_t val = dev->interface->read_register(REG_0x32);
+    std::uint8_t val = dev->interface->read_register(REG_0x32);
 
   /* LiDE 110, 210 and 220 cases */
     if(dev->model->gpio_id != GpioId::CANON_LIDE_120) {
@@ -883,7 +882,7 @@ void CommandSetGl124::begin_scan(Genesys_Device* dev, const Genesys_Sensor& sens
     scanner_clear_scan_and_feed_counts(*dev);
 
     // enable scan and motor
-    uint8_t val = dev->interface->read_register(REG_0x01);
+    std::uint8_t val = dev->interface->read_register(REG_0x01);
     val |= REG_0x01_SCAN;
     dev->interface->write_register(REG_0x01, val);
 
@@ -974,7 +973,7 @@ void CommandSetGl124::wait_for_motor_stop(Genesys_Device* dev) const
     DBG_HELPER(dbg);
 
     auto status = scanner_read_status(*dev);
-    uint8_t val40 = dev->interface->read_register(REG_0x100);
+    std::uint8_t val40 = dev->interface->read_register(REG_0x100);
 
     if (!status.is_motor_enabled && (val40 & REG_0x100_MOTMFLG) == 0) {
         return;
@@ -997,7 +996,7 @@ void CommandSetGl124::send_shading_data(Genesys_Device* dev, const Genesys_Senso
 {
     DBG_HELPER_ARGS(dbg, "writing %d bytes of shading data", size);
     std::uint32_t addr, length, segcnt, pixels, i;
-    uint8_t *ptr, *src;
+    std::uint8_t *ptr, *src;
 
   /* logical size of a color as seen by generic code of the frontend */
     length = size / 3;
@@ -1020,7 +1019,7 @@ void CommandSetGl124::send_shading_data(Genesys_Device* dev, const Genesys_Senso
                                      std::to_string(dev->session.segment_count));
 
   DBG( DBG_io2, "%s: using chunks of %d bytes (%d shading data pixels)\n",__func__,length, length/4);
-    std::vector<uint8_t> buffer(pixels * dev->session.segment_count, 0);
+    std::vector<std::uint8_t> buffer(pixels * dev->session.segment_count, 0);
 
   /* write actual red data */
   for(i=0;i<3;i++)
@@ -1047,7 +1046,7 @@ void CommandSetGl124::send_shading_data(Genesys_Device* dev, const Genesys_Senso
           /* next shading coefficient */
           ptr+=4;
         }
-        uint8_t val = dev->interface->read_register(0xd0+i);
+        std::uint8_t val = dev->interface->read_register(0xd0+i);
       addr = val * 8192 + 0x10000000;
         dev->interface->write_ahb(addr, pixels * dev->session.segment_count, buffer.data());
     }
@@ -1254,7 +1253,7 @@ void CommandSetGl124::asic_boot(Genesys_Device* dev, bool cold) const
     dev->interface->write_register(0x36, 0x01);
 
     // set GPIO 17
-    uint8_t val = dev->interface->read_register(0x33);
+    std::uint8_t val = dev->interface->read_register(0x33);
     val |= 0x01;
     dev->interface->write_register(0x33, val);
 
@@ -1297,7 +1296,7 @@ void CommandSetGl124::update_hardware_sensors(Genesys_Scanner* s) const
      any of them.
    */
     DBG_HELPER(dbg);
-    uint8_t val = s->dev->interface->read_register(REG_0x31);
+    std::uint8_t val = s->dev->interface->read_register(REG_0x31);
 
   /* TODO : for the next scanner special case,
    * add another per scanner button profile struct to avoid growing