kopia lustrzana https://gitlab.com/sane-project/backends
Merge branch 'genesys-use-float-for-fixed' into 'master'
genesys: Use float precision for data that was previously saved in fixed format See merge request sane-project/backends!326merge-requests/327/merge
Povilas Kanapickas
commit
34c15b47d9
|
|
@ -55,6 +55,7 @@
|
|||
#include "register.h"
|
||||
#include "usb_device.h"
|
||||
#include "scanner_interface.h"
|
||||
#include "utilities.h"
|
||||
#include <vector>
|
||||
|
||||
namespace genesys {
|
||||
|
|
@ -77,24 +78,6 @@ struct Genesys_Gpo
|
|||
GenesysRegisterSettingSet regs;
|
||||
};
|
||||
|
||||
/// Stores a SANE_Fixed value which is automatically converted from and to floating-point values
|
||||
class FixedFloat
|
||||
{
|
||||
public:
|
||||
FixedFloat() = default;
|
||||
FixedFloat(const FixedFloat&) = default;
|
||||
FixedFloat(double number) : value_{SANE_FIX(number)} {}
|
||||
FixedFloat& operator=(const FixedFloat&) = default;
|
||||
FixedFloat& operator=(double number) { value_ = SANE_FIX(number); return *this; }
|
||||
|
||||
operator double() const { return value(); }
|
||||
|
||||
double value() const { return SANE_UNFIX(value_); }
|
||||
|
||||
private:
|
||||
SANE_Fixed value_ = 0;
|
||||
};
|
||||
|
||||
struct MethodResolutions
|
||||
{
|
||||
std::vector<ScanMethod> methods;
|
||||
|
|
@ -143,49 +126,49 @@ struct Genesys_Model
|
|||
// All offsets below are with respect to the sensor home position
|
||||
|
||||
// Start of scan area in mm
|
||||
FixedFloat x_offset = 0;
|
||||
float x_offset = 0;
|
||||
|
||||
// Start of scan area in mm (Amount of feeding needed to get to the medium)
|
||||
FixedFloat y_offset = 0;
|
||||
float y_offset = 0;
|
||||
|
||||
// Size of scan area in mm
|
||||
FixedFloat x_size = 0;
|
||||
float x_size = 0;
|
||||
|
||||
// Size of scan area in mm
|
||||
FixedFloat y_size = 0;
|
||||
float y_size = 0;
|
||||
|
||||
// Start of white strip in mm
|
||||
FixedFloat y_offset_calib_white = 0;
|
||||
float y_offset_calib_white = 0;
|
||||
|
||||
// Start of black mark in mm
|
||||
FixedFloat x_offset_calib_black = 0;
|
||||
float x_offset_calib_black = 0;
|
||||
|
||||
// Start of scan area in transparency mode in mm
|
||||
FixedFloat x_offset_ta = 0;
|
||||
float x_offset_ta = 0;
|
||||
|
||||
// Start of scan area in transparency mode in mm
|
||||
FixedFloat y_offset_ta = 0;
|
||||
float y_offset_ta = 0;
|
||||
|
||||
// Size of scan area in transparency mode in mm
|
||||
FixedFloat x_size_ta = 0;
|
||||
float x_size_ta = 0;
|
||||
|
||||
// Size of scan area in transparency mode in mm
|
||||
FixedFloat y_size_ta = 0;
|
||||
float y_size_ta = 0;
|
||||
|
||||
// The position of the sensor when it's aligned with the lamp for transparency scanning
|
||||
FixedFloat y_offset_sensor_to_ta = 0;
|
||||
float y_offset_sensor_to_ta = 0;
|
||||
|
||||
// Start of white strip in transparency mode in mm
|
||||
FixedFloat y_offset_calib_white_ta = 0;
|
||||
float y_offset_calib_white_ta = 0;
|
||||
|
||||
// Start of black strip in transparency mode in mm
|
||||
FixedFloat y_offset_calib_black_ta = 0;
|
||||
float y_offset_calib_black_ta = 0;
|
||||
|
||||
// Size of scan area after paper sensor stop sensing document in mm
|
||||
FixedFloat post_scan = 0;
|
||||
float post_scan = 0;
|
||||
|
||||
// Amount of feeding needed to eject document after finishing scanning in mm
|
||||
FixedFloat eject_feed = 0;
|
||||
float eject_feed = 0;
|
||||
|
||||
// Line-distance correction (in pixel at optical_ydpi) for CCD scanners
|
||||
SANE_Int ld_shift_r = 0;
|
||||
|
|
|
|||
|
|
@ -56,7 +56,6 @@ struct Genesys_Calibration_Cache;
|
|||
class CommandSet;
|
||||
|
||||
// device.h
|
||||
class FixedFloat;
|
||||
struct Genesys_Gpo;
|
||||
struct MethodResolutions;
|
||||
struct Genesys_Model;
|
||||
|
|
|
|||
|
|
@ -162,9 +162,9 @@ static const SANE_Range u16_range = {
|
|||
};
|
||||
|
||||
static const SANE_Range percentage_range = {
|
||||
SANE_FIX (0), /* minimum */
|
||||
SANE_FIX (100), /* maximum */
|
||||
SANE_FIX (1) /* quantization */
|
||||
float_to_fixed(0), // minimum
|
||||
float_to_fixed(100), // maximum
|
||||
float_to_fixed(1) // quantization
|
||||
};
|
||||
|
||||
static const SANE_Range threshold_curve_range = {
|
||||
|
|
@ -690,7 +690,7 @@ void sanei_genesys_search_reference_point(Genesys_Device* dev, Genesys_Sensor& s
|
|||
top += 10;
|
||||
dev->model->y_offset_calib_white = (top * MM_PER_INCH) / dpi;
|
||||
DBG(DBG_info, "%s: black stripe y_offset = %f mm \n", __func__,
|
||||
dev->model->y_offset_calib_white.value());
|
||||
dev->model->y_offset_calib_white);
|
||||
}
|
||||
|
||||
/* find white corner in dark area : TODO yet another flag */
|
||||
|
|
@ -711,7 +711,7 @@ void sanei_genesys_search_reference_point(Genesys_Device* dev, Genesys_Sensor& s
|
|||
top = top / count;
|
||||
dev->model->y_offset_calib_white = (top * MM_PER_INCH) / dpi;
|
||||
DBG(DBG_info, "%s: white corner y_offset = %f mm\n", __func__,
|
||||
dev->model->y_offset_calib_white.value());
|
||||
dev->model->y_offset_calib_white);
|
||||
}
|
||||
|
||||
DBG(DBG_proc, "%s: ccd_start_xoffset = %d, left = %d, top = %d\n", __func__,
|
||||
|
|
@ -1464,7 +1464,7 @@ static void genesys_coarse_calibration(Genesys_Device* dev, Genesys_Sensor& sens
|
|||
|
||||
unsigned channels = dev->settings.get_channels();
|
||||
|
||||
DBG(DBG_info, "channels %d y_size %f xres %d\n", channels, dev->model->y_size.value(),
|
||||
DBG(DBG_info, "channels %d y_size %f xres %d\n", channels, dev->model->y_size,
|
||||
dev->settings.xres);
|
||||
unsigned size = static_cast<unsigned>(channels * 2 * dev->model->y_size * dev->settings.xres /
|
||||
MM_PER_INCH);
|
||||
|
|
@ -3585,12 +3585,12 @@ static unsigned pick_resolution(const std::vector<unsigned>& resolutions, unsign
|
|||
static void calc_parameters(Genesys_Scanner* s)
|
||||
{
|
||||
DBG_HELPER(dbg);
|
||||
double tl_x = 0, tl_y = 0, br_x = 0, br_y = 0;
|
||||
float tl_x = 0, tl_y = 0, br_x = 0, br_y = 0;
|
||||
|
||||
tl_x = SANE_UNFIX(s->pos_top_left_x);
|
||||
tl_y = SANE_UNFIX(s->pos_top_left_y);
|
||||
br_x = SANE_UNFIX(s->pos_bottom_right_x);
|
||||
br_y = SANE_UNFIX(s->pos_bottom_right_y);
|
||||
tl_x = fixed_to_float(s->pos_top_left_x);
|
||||
tl_y = fixed_to_float(s->pos_top_left_y);
|
||||
br_x = fixed_to_float(s->pos_bottom_right_x);
|
||||
br_y = fixed_to_float(s->pos_bottom_right_y);
|
||||
|
||||
s->params.last_frame = true; /* only single pass scanning supported */
|
||||
|
||||
|
|
@ -3704,7 +3704,7 @@ static void calc_parameters(Genesys_Scanner* s)
|
|||
s->dev->settings.tl_y = tl_y;
|
||||
|
||||
// threshold setting
|
||||
s->dev->settings.threshold = static_cast<int>(2.55 * (SANE_UNFIX(s->threshold)));
|
||||
s->dev->settings.threshold = static_cast<int>(2.55f * (fixed_to_float(s->threshold)));
|
||||
|
||||
// color filter
|
||||
if (s->color_filter == "Red") {
|
||||
|
|
@ -3730,9 +3730,9 @@ static void calc_parameters(Genesys_Scanner* s)
|
|||
/* some digital processing requires the whole picture to be buffered */
|
||||
/* no digital processing takes place when doing preview, or when bit depth is
|
||||
* higher than 8 bits */
|
||||
if ((s->swdespeck || s->swcrop || s->swdeskew || s->swderotate ||(SANE_UNFIX(s->swskip)>0))
|
||||
&& (!s->preview)
|
||||
&& (s->bit_depth <= 8))
|
||||
if ((s->swdespeck || s->swcrop || s->swdeskew || s->swderotate ||(fixed_to_float(s->swskip)>0))
|
||||
&& (!s->preview)
|
||||
&& (s->bit_depth <= 8))
|
||||
{
|
||||
s->dev->buffer_image = true;
|
||||
}
|
||||
|
|
@ -3807,9 +3807,9 @@ init_gamma_vector_option (Genesys_Scanner * scanner, int option)
|
|||
static SANE_Range create_range(float size)
|
||||
{
|
||||
SANE_Range range;
|
||||
range.min = SANE_FIX(0.0);
|
||||
range.max = SANE_FIX(size);
|
||||
range.quant = SANE_FIX(0.0);
|
||||
range.min = float_to_fixed(0.0);
|
||||
range.max = float_to_fixed(size);
|
||||
range.quant = float_to_fixed(0.0);
|
||||
return range;
|
||||
}
|
||||
|
||||
|
|
@ -4226,7 +4226,7 @@ static void init_options(Genesys_Scanner* s)
|
|||
s->opt[OPT_THRESHOLD].unit = SANE_UNIT_PERCENT;
|
||||
s->opt[OPT_THRESHOLD].constraint_type = SANE_CONSTRAINT_RANGE;
|
||||
s->opt[OPT_THRESHOLD].constraint.range = &percentage_range;
|
||||
s->threshold = SANE_FIX(50);
|
||||
s->threshold = float_to_fixed(50);
|
||||
|
||||
/* BW threshold curve */
|
||||
s->opt[OPT_THRESHOLD_CURVE].name = "threshold-curve";
|
||||
|
|
@ -5176,7 +5176,7 @@ static void print_option(DebugMessageHelper& dbg, const Genesys_Scanner& s, int
|
|||
return;
|
||||
}
|
||||
case SANE_TYPE_FIXED: {
|
||||
dbg.vlog(DBG_proc, "value: %f", SANE_UNFIX(*reinterpret_cast<SANE_Word*>(val)));
|
||||
dbg.vlog(DBG_proc, "value: %f", fixed_to_float(*reinterpret_cast<SANE_Word*>(val)));
|
||||
return;
|
||||
}
|
||||
case SANE_TYPE_STRING: {
|
||||
|
|
@ -5904,7 +5904,7 @@ void sane_start_impl(SANE_Handle handle)
|
|||
if (s->swskip > 0 && IS_ACTIVE(OPT_SWSKIP)) {
|
||||
auto status = sanei_magic_isBlank(&s->params,
|
||||
s->dev->img_buffer.data(),
|
||||
SANE_UNFIX(s->swskip));
|
||||
fixed_to_float(s->swskip));
|
||||
|
||||
if (status == SANE_STATUS_NO_DOCS && s->dev->model->is_sheetfed) {
|
||||
DBG(DBG_info, "%s: blank page, recurse\n", __func__);
|
||||
|
|
|
|||
|
|
@ -50,8 +50,31 @@
|
|||
#include <sstream>
|
||||
#include <vector>
|
||||
|
||||
|
||||
namespace genesys {
|
||||
|
||||
// just like SANE_FIX and SANE_UNFIX except that the conversion is done by a function and argument
|
||||
// precision is handled correctly
|
||||
inline SANE_Word double_to_fixed(double v)
|
||||
{
|
||||
return static_cast<SANE_Word>(v * (1 << SANE_FIXED_SCALE_SHIFT));
|
||||
}
|
||||
|
||||
inline SANE_Word float_to_fixed(float v)
|
||||
{
|
||||
return static_cast<SANE_Word>(v * (1 << SANE_FIXED_SCALE_SHIFT));
|
||||
}
|
||||
|
||||
inline float fixed_to_float(SANE_Word v)
|
||||
{
|
||||
return static_cast<float>(v) / (1 << SANE_FIXED_SCALE_SHIFT);
|
||||
}
|
||||
|
||||
inline double fixed_to_double(SANE_Word v)
|
||||
{
|
||||
return static_cast<double>(v) / (1 << SANE_FIXED_SCALE_SHIFT);
|
||||
}
|
||||
|
||||
template<class T>
|
||||
void compute_array_percentile_approx(T* result, const T* data,
|
||||
std::size_t line_count, std::size_t elements_per_line,
|
||||
|
|
|
|||
|
|
@ -143,7 +143,7 @@ public:
|
|||
auto i = find_option(name, SANE_TYPE_FIXED);
|
||||
int value = 0;
|
||||
TIE(sane_control_option(handle_, i, SANE_ACTION_GET_VALUE, &value, nullptr));
|
||||
return static_cast<float>(SANE_UNFIX(value));
|
||||
return genesys::fixed_to_float(value);
|
||||
}
|
||||
|
||||
void set_value_float(const std::string& name, float value)
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue