1*4882a593SmuzhiyunFrom f67cfd6a534e9faaca83afebd61a6d77d7837174 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Peter Seiderer <ps.report@gmx.net> 3*4882a593SmuzhiyunDate: Mon, 15 Mar 2021 20:53:55 +0100 4*4882a593SmuzhiyunSubject: [PATCH] genesys: fix gcc-4.8 compile 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunFixes: 7*4882a593Smuzhiyun 8*4882a593Smuzhiyun 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*4882a593Smuzhiyun stream_{stream} 10*4882a593Smuzhiyun ^ 11*4882a593Smuzhiyun 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*4882a593Smuzhiyun source_{source} 13*4882a593Smuzhiyun ^ 14*4882a593Smuzhiyun 15*4882a593Smuzhiyun[Upstream: https://gitlab.com/sane-project/backends/-/merge_requests/609] 16*4882a593SmuzhiyunSigned-off-by: Peter Seiderer <ps.report@gmx.net> 17*4882a593Smuzhiyun--- 18*4882a593Smuzhiyun backend/genesys/image_pipeline.cpp | 2 +- 19*4882a593Smuzhiyun backend/genesys/utilities.h | 2 +- 20*4882a593Smuzhiyun 2 files changed, 2 insertions(+), 2 deletions(-) 21*4882a593Smuzhiyun 22*4882a593Smuzhiyundiff --git a/backend/genesys/image_pipeline.cpp b/backend/genesys/image_pipeline.cpp 23*4882a593Smuzhiyunindex 4161e95..14e2f8d 100644 24*4882a593Smuzhiyun--- a/backend/genesys/image_pipeline.cpp 25*4882a593Smuzhiyun+++ b/backend/genesys/image_pipeline.cpp 26*4882a593Smuzhiyun@@ -712,7 +712,7 @@ ImagePipelineNodeCalibrate::ImagePipelineNodeCalibrate(ImagePipelineNode& source 27*4882a593Smuzhiyun const std::vector<std::uint16_t>& bottom, 28*4882a593Smuzhiyun const std::vector<std::uint16_t>& top, 29*4882a593Smuzhiyun std::size_t x_start) : 30*4882a593Smuzhiyun- source_{source} 31*4882a593Smuzhiyun+ source_(source) 32*4882a593Smuzhiyun { 33*4882a593Smuzhiyun std::size_t size = 0; 34*4882a593Smuzhiyun if (bottom.size() >= x_start && top.size() >= x_start) { 35*4882a593Smuzhiyundiff --git a/backend/genesys/utilities.h b/backend/genesys/utilities.h 36*4882a593Smuzhiyunindex 6e637d0..2ef2ddd 100644 37*4882a593Smuzhiyun--- a/backend/genesys/utilities.h 38*4882a593Smuzhiyun+++ b/backend/genesys/utilities.h 39*4882a593Smuzhiyun@@ -226,7 +226,7 @@ class BasicStreamStateSaver 40*4882a593Smuzhiyun { 41*4882a593Smuzhiyun public: 42*4882a593Smuzhiyun explicit BasicStreamStateSaver(std::basic_ios<Char, Traits>& stream) : 43*4882a593Smuzhiyun- stream_{stream} 44*4882a593Smuzhiyun+ stream_(stream) 45*4882a593Smuzhiyun { 46*4882a593Smuzhiyun flags_ = stream_.flags(); 47*4882a593Smuzhiyun width_ = stream_.width(); 48*4882a593Smuzhiyun-- 49*4882a593Smuzhiyun2.30.1 50*4882a593Smuzhiyun 51