Merge branch 'ps-devel-fix-gcc-4-8-compile-001' into 'master'

genesys: fix gcc-4.8 compile

See merge request sane-project/backends!609
pixma-add-canon-ts-3400-series
Povilas Kanapickas 2021-12-15 22:12:13 +00:00
commit dc32df1001
2 zmienionych plików z 2 dodań i 2 usunięć

Wyświetl plik

@ -712,7 +712,7 @@ ImagePipelineNodeCalibrate::ImagePipelineNodeCalibrate(ImagePipelineNode& source
const std::vector<std::uint16_t>& bottom,
const std::vector<std::uint16_t>& top,
std::size_t x_start) :
source_{source}
source_(source)
{
std::size_t size = 0;
if (bottom.size() >= x_start && top.size() >= x_start) {

Wyświetl plik

@ -226,7 +226,7 @@ class BasicStreamStateSaver
{
public:
explicit BasicStreamStateSaver(std::basic_ios<Char, Traits>& stream) :
stream_{stream}
stream_(stream)
{
flags_ = stream_.flags();
width_ = stream_.width();