Merge branch 'genesys-fix-cxx11-build' into 'master'

genesys: Remove accidental use of C++14 features

See merge request sane-project/backends!166
merge-requests/167/head
Povilas Kanapickas 2019-09-27 00:32:05 +00:00
commit 16b0033439
2 zmienionych plików z 15 dodań i 0 usunięć

Wyświetl plik

@ -1156,6 +1156,16 @@ void compute_session_buffer_sizes(AsicType asic, ScanSession& s)
size_t lines_mult = 0;
size_t max_size = 0; // does not apply if 0
size_t stagger_lines = 0;
BufferConfig() = default;
BufferConfig(std::size_t* rs, std::size_t l, std::size_t lm, std::size_t ms,
std::size_t sl) :
result_size{rs},
lines{l},
lines_mult{lm},
max_size{ms},
stagger_lines{sl}
{}
};
std::array<BufferConfig, 4> configs;

Wyświetl plik

@ -153,6 +153,11 @@ struct SensorExposure {
uint16_t green = 0;
uint16_t blue = 0;
SensorExposure() = default;
SensorExposure(std::uint16_t r, std::uint16_t g, std::uint16_t b) :
red{r}, green{g}, blue{b}
{}
bool operator==(const SensorExposure& other) const
{
return red == other.red && green == other.green && blue == other.blue;