Skip to content

W
wine-winehq
Commit 5590294c authored by Ilia Docin's avatar Ilia Docin Committed by Alexandre Julliard
Browse files
Options

sane.ds: Do the reverse conversion of frame edges before setting.

Sane backends must attach a unit of either pixels or millimeters to scan area options.
parent ed29473e
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 4 deletions
dlls/sane.ds/ds_image.c
View file @ 5590294c
...@@ -164,10 +164,10 @@ TW_UINT16 SANE_ImageLayoutSet (pTW_IDENTITY pOrigin, ...@@ -164,10 +164,10 @@ TW_UINT16 SANE_ImageLayoutSet (pTW_IDENTITY pOrigin,
img->Frame.Right.Whole, img->Frame.Right.Frac, img->Frame.Right.Whole, img->Frame.Right.Frac,
img->Frame.Bottom.Whole, img->Frame.Bottom.Frac); img->Frame.Bottom.Whole, img->Frame.Bottom.Frac);
tlx = img->Frame.Left.Whole * 65536 + img->Frame.Left.Frac; tlx = convert_twain_res_to_sane( img->Frame.Left );
tly = img->Frame.Top.Whole * 65536 + img->Frame.Top.Frac; tly = convert_twain_res_to_sane( img->Frame.Top );
brx = img->Frame.Right.Whole * 65536 + img->Frame.Right.Frac; brx = convert_twain_res_to_sane( img->Frame.Right );
bry = img->Frame.Bottom.Whole * 65536 + img->Frame.Bottom.Frac; bry = convert_twain_res_to_sane( img->Frame.Bottom );
twrc = sane_option_set_scan_area( tlx, tly, brx, bry, &changed ); twrc = sane_option_set_scan_area( tlx, tly, brx, bry, &changed );
if (twrc != TWRC_SUCCESS) if (twrc != TWRC_SUCCESS)
......
dlls/sane.ds/options.c
View file @ 5590294c
...@@ -200,6 +200,11 @@ TW_FIX32 convert_sane_res_to_twain(int res) ...@@ -200,6 +200,11 @@ TW_FIX32 convert_sane_res_to_twain(int res)
return value; return value;
} }
int convert_twain_res_to_sane( TW_FIX32 res )
{
return MulDiv( res.Whole * 65536 + res.Frac, 254, 10 ); /* inch -> mm */
}
TW_UINT16 get_sane_params( struct frame_parameters *params ) TW_UINT16 get_sane_params( struct frame_parameters *params )
{ {
return SANE_CALL( get_params, params ); return SANE_CALL( get_params, params );
......
dlls/sane.ds/sane_i.h
View file @ 5590294c
...@@ -208,6 +208,7 @@ TW_UINT16 sane_option_get_scan_area( int *tlx, int *tly, int *brx, int *bry ) DE ...@@ -208,6 +208,7 @@ TW_UINT16 sane_option_get_scan_area( int *tlx, int *tly, int *brx, int *bry ) DE
TW_UINT16 sane_option_get_max_scan_area( int *tlx, int *tly, int *brx, int *bry ) DECLSPEC_HIDDEN; TW_UINT16 sane_option_get_max_scan_area( int *tlx, int *tly, int *brx, int *bry ) DECLSPEC_HIDDEN;
TW_UINT16 sane_option_set_scan_area( int tlx, int tly, int brx, int bry, BOOL *reload ) DECLSPEC_HIDDEN; TW_UINT16 sane_option_set_scan_area( int tlx, int tly, int brx, int bry, BOOL *reload ) DECLSPEC_HIDDEN;
TW_FIX32 convert_sane_res_to_twain( int res ) DECLSPEC_HIDDEN; TW_FIX32 convert_sane_res_to_twain( int res ) DECLSPEC_HIDDEN;
int convert_twain_res_to_sane( TW_FIX32 res ) DECLSPEC_HIDDEN;
TW_UINT16 get_sane_params( struct frame_parameters *params ) DECLSPEC_HIDDEN; TW_UINT16 get_sane_params( struct frame_parameters *params ) DECLSPEC_HIDDEN;
#endif #endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment