Merge branch 'escl-crop-fix' into 'master'

Fix convert size.

See merge request sane-project/backends!332
merge-requests/334/merge
Olaf Meeuwissen 2020-02-12 11:27:41 +00:00
commit 06cd16a0ea
1 zmienionych plików z 2 dodań i 2 usunięć

Wyświetl plik

@ -152,8 +152,8 @@ enum
NUM_OPTIONS
};
#define PIXEL_TO_MM(pixels, dpi) SANE_FIX(SANE_UNFIX(pixels) * 25.4 / (dpi))
#define MM_TO_PIXEL(millimeters, dpi) SANE_FIX(SANE_UNFIX(millimeters) * (dpi) / 25.4)
#define PIXEL_TO_MM(pixels, dpi) SANE_FIX((double)pixels * 25.4 / (dpi))
#define MM_TO_PIXEL(millimeters, dpi) (SANE_Word)round(SANE_UNFIX(millimeters) * (dpi) / 25.4)
ESCL_Device *escl_devices(SANE_Status *status);
SANE_Status escl_device_add(int port_nb, const char *model_name,