kopia lustrzana https://gitlab.com/sane-project/backends
genesys: Remove dead code
rodzic
3084c41269
commit
e7e5322003
|
@ -661,34 +661,6 @@ static unsigned align_int_up(unsigned num, unsigned alignment)
|
|||
return num;
|
||||
}
|
||||
|
||||
void compute_session_pipeline(const Genesys_Device* dev, ScanSession& s)
|
||||
{
|
||||
auto channels = s.params.channels;
|
||||
auto depth = s.params.depth;
|
||||
|
||||
s.pipeline_needs_reorder = true;
|
||||
if (channels != 3 && depth != 16) {
|
||||
s.pipeline_needs_reorder = false;
|
||||
}
|
||||
#ifndef WORDS_BIGENDIAN
|
||||
if (channels != 3 && depth == 16) {
|
||||
s.pipeline_needs_reorder = false;
|
||||
}
|
||||
if (channels == 3 && depth == 16 && !dev->model->is_cis &&
|
||||
dev->model->line_mode_color_order == ColorOrder::RGB)
|
||||
{
|
||||
s.pipeline_needs_reorder = false;
|
||||
}
|
||||
#endif
|
||||
if (channels == 3 && depth == 8 && !dev->model->is_cis &&
|
||||
dev->model->line_mode_color_order == ColorOrder::RGB)
|
||||
{
|
||||
s.pipeline_needs_reorder = false;
|
||||
}
|
||||
s.pipeline_needs_ccd = s.max_color_shift_lines + s.num_staggered_lines > 0;
|
||||
s.pipeline_needs_shrink = dev->settings.requested_pixels != s.output_pixels;
|
||||
}
|
||||
|
||||
void compute_session_pixel_offsets(const Genesys_Device* dev, ScanSession& s,
|
||||
const Genesys_Sensor& sensor)
|
||||
{
|
||||
|
@ -898,7 +870,6 @@ void compute_session(const Genesys_Device* dev, ScanSession& s, const Genesys_Se
|
|||
s.output_total_bytes = s.output_line_bytes * s.output_line_count;
|
||||
|
||||
s.buffer_size_read = s.output_line_bytes_raw * 64;
|
||||
compute_session_pipeline(dev, s);
|
||||
compute_session_pixel_offsets(dev, s, sensor);
|
||||
|
||||
if (dev->model->asic_type == AsicType::GL124 ||
|
||||
|
|
|
@ -128,10 +128,7 @@ bool ScanSession::operator==(const ScanSession& other) const
|
|||
output_segment_start_offset == other.output_segment_start_offset &&
|
||||
buffer_size_read == other.buffer_size_read &&
|
||||
enable_ledadd == other.enable_ledadd &&
|
||||
use_host_side_calib == other.use_host_side_calib &&
|
||||
pipeline_needs_reorder == other.pipeline_needs_reorder &&
|
||||
pipeline_needs_ccd == other.pipeline_needs_ccd &&
|
||||
pipeline_needs_shrink == other.pipeline_needs_shrink;
|
||||
use_host_side_calib == other.use_host_side_calib;
|
||||
}
|
||||
|
||||
std::ostream& operator<<(std::ostream& out, const ScanSession& session)
|
||||
|
@ -167,10 +164,6 @@ std::ostream& operator<<(std::ostream& out, const ScanSession& session)
|
|||
<< " buffer_size_read: " << session.buffer_size_read << '\n'
|
||||
<< " enable_ledadd: " << session.enable_ledadd << '\n'
|
||||
<< " use_host_side_calib: " << session.use_host_side_calib << '\n'
|
||||
<< " filters: "
|
||||
<< (session.pipeline_needs_reorder ? " reorder": "")
|
||||
<< (session.pipeline_needs_ccd ? " ccd": "")
|
||||
<< (session.pipeline_needs_shrink ? " shrink": "") << '\n'
|
||||
<< " params: " << format_indent_braced_list(4, session.params) << '\n'
|
||||
<< "}";
|
||||
return out;
|
||||
|
|
|
@ -318,11 +318,6 @@ struct ScanSession {
|
|||
// whether calibration should be performed host-side
|
||||
bool use_host_side_calib = false;
|
||||
|
||||
// what pipeline modifications are needed
|
||||
bool pipeline_needs_reorder = false;
|
||||
bool pipeline_needs_ccd = false;
|
||||
bool pipeline_needs_shrink = false;
|
||||
|
||||
void assert_computed() const
|
||||
{
|
||||
if (!computed) {
|
||||
|
@ -373,9 +368,6 @@ void serialize(Stream& str, ScanSession& x)
|
|||
serialize(str, x.buffer_size_read);
|
||||
serialize(str, x.enable_ledadd);
|
||||
serialize(str, x.use_host_side_calib);
|
||||
serialize(str, x.pipeline_needs_reorder);
|
||||
serialize(str, x.pipeline_needs_ccd);
|
||||
serialize(str, x.pipeline_needs_shrink);
|
||||
}
|
||||
|
||||
std::ostream& operator<<(std::ostream& out, const SANE_Parameters& params);
|
||||
|
|
Ładowanie…
Reference in New Issue