Merge branch 'genesys-fix-std-accumulate' into 'master'

genesys: Use correct type for std::plus See merge request sane-project/backends!128
2019-08-31 12:24:34 +00:00 · 2019-08-31 12:24:34 +00:00 · c73a7b5b06
commit c73a7b5b06
--- a/backend/genesys.cc
+++ b/backend/genesys.cc
@ -1248,7 +1248,7 @@ void sanei_genesys_calculate_zmod(SANE_Bool two_table,

    // acceleration total time
    unsigned sum = std::accumulate(slope_table.begin(), slope_table.begin() + acceleration_steps,
-                                   0, std::plus<uint16_t>());
+                                   0, std::plus<unsigned>());

    /* Z1MOD:
        c = sum(slope_table; reg_stepno)