1From f67cfd6a534e9faaca83afebd61a6d77d7837174 Mon Sep 17 00:00:00 2001 2From: Peter Seiderer <ps.report@gmx.net> 3Date: Mon, 15 Mar 2021 20:53:55 +0100 4Subject: [PATCH] genesys: fix gcc-4.8 compile 5 6Fixes: 7 8 genesys/utilities.h:229:23: error: invalid initialization of non-const reference of type 'std::basic_ios<char>&' from an rvalue of type '<brace-enclosed initializer list>' 9 stream_{stream} 10 ^ 11 genesys/image_pipeline.cpp:715:19: error: invalid initialization of non-const reference of type 'genesys::ImagePipelineNode&' from an rvalue of type '<brace-enclosed initializer list>' 12 source_{source} 13 ^ 14 15[Upstream: https://gitlab.com/sane-project/backends/-/merge_requests/609] 16Signed-off-by: Peter Seiderer <ps.report@gmx.net> 17--- 18 backend/genesys/image_pipeline.cpp | 2 +- 19 backend/genesys/utilities.h | 2 +- 20 2 files changed, 2 insertions(+), 2 deletions(-) 21 22diff --git a/backend/genesys/image_pipeline.cpp b/backend/genesys/image_pipeline.cpp 23index 4161e95..14e2f8d 100644 24--- a/backend/genesys/image_pipeline.cpp 25+++ b/backend/genesys/image_pipeline.cpp 26@@ -712,7 +712,7 @@ ImagePipelineNodeCalibrate::ImagePipelineNodeCalibrate(ImagePipelineNode& source 27 const std::vector<std::uint16_t>& bottom, 28 const std::vector<std::uint16_t>& top, 29 std::size_t x_start) : 30- source_{source} 31+ source_(source) 32 { 33 std::size_t size = 0; 34 if (bottom.size() >= x_start && top.size() >= x_start) { 35diff --git a/backend/genesys/utilities.h b/backend/genesys/utilities.h 36index 6e637d0..2ef2ddd 100644 37--- a/backend/genesys/utilities.h 38+++ b/backend/genesys/utilities.h 39@@ -226,7 +226,7 @@ class BasicStreamStateSaver 40 { 41 public: 42 explicit BasicStreamStateSaver(std::basic_ios<Char, Traits>& stream) : 43- stream_{stream} 44+ stream_(stream) 45 { 46 flags_ = stream_.flags(); 47 width_ = stream_.width(); 48-- 492.30.1 50 51