openharmony/third_party_sane-airscan
1
0
Fork 0
mirror of https://github.com/openharmony/third_party_sane-airscan.git synced 2026-06-30 21:17:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

Canon iR2625/2630: ignore resolutions >300 DPI (see #57)

Browse Source 
Canon iR2625/2630 announces resolutions up to 600 DPI, but actually
    supports them only in Black&White mode:

      https://oip.manual.canon/USRMA-4209-zz-CSL-2600-enUV/contents/devu-apdx-sys_spec-send.html?search=600

    In all other modes, only resolutions up to 300 DPI are supported
This commit is contained in:
Alexander Pevzner
2020-08-16 00:47:13 +03:00
parent 37dec2f85c
commit f9dee15511
3 changed files with 51 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
airscan-array.c
+18
View File
@@ -19,6 +19,24 @@ sane_word_array_sort_cmp(const void *p1, const void *p2)
return *(SANE_Word*) p1 - *(SANE_Word*) p2;
}
/* Drop array elements that outside of specified boundary
*/
void
sane_word_array_bound (SANE_Word *a, SANE_Word min, SANE_Word max)
{
SANE_Word len = a[0];
SANE_Word i, o;
for (i = o = 1; i < len + 1; i ++) {
if (min <= a[i] && a[i] <= max) {
a[o ++] = a[i];
}
}
a[0] = o - 1;
mem_shrink(a, o);
}
/* Sort array of SANE_Word in increasing order
*/
void
airscan-escl.c
+28 -1
View File
@@ -422,6 +422,7 @@ escl_devcaps_parse (devcaps *caps, const char *xml_text, size_t xml_len)
{
error err = NULL;
xml_rd *xml;
bool quirk_canon_iR2625_2630 = false;
/* Parse capabilities XML */
err = xml_rd_begin(&xml, xml_text, xml_len, NULL);
@@ -436,7 +437,13 @@ escl_devcaps_parse (devcaps *caps, const char *xml_text, size_t xml_len)
xml_rd_enter(xml);
for (; !xml_rd_end(xml); xml_rd_next(xml)) {
if (xml_rd_node_name_match(xml, "scan:Platen")) {
if (xml_rd_node_name_match(xml, "pwg:MakeAndModel")) {
const char *m = xml_rd_node_value(xml);
if (!strcmp(m, "Canon iR2625/2630")) {
quirk_canon_iR2625_2630 = true;
}
} else if (xml_rd_node_name_match(xml, "scan:Platen")) {
xml_rd_enter(xml);
if (xml_rd_node_name_match(xml, "scan:PlatenInputCaps")) {
err = escl_devcaps_source_parse(xml,
@@ -483,6 +490,26 @@ escl_devcaps_parse (devcaps *caps, const char *xml_text, size_t xml_len)
goto DONE;
}
/* Apply quirks, if any */
if (quirk_canon_iR2625_2630) {
/* This device announces resolutions up to 600 DPI,
* but actually doesn't support more that 300
*
* https://oip.manual.canon/USRMA-4209-zz-CSL-2600-enUV/contents/devu-apdx-sys_spec-send.html?search=600
*
* See #57 for details
*/
for (id_src = (ID_SOURCE) 0; id_src < NUM_ID_SOURCE; id_src ++) {
devcaps_source *src = caps->src[id_src];
if (src != NULL &&
/* paranoia: array won't be empty after quirk applied */
sane_word_array_len(src->resolutions) > 0 &&
src->resolutions[1] <= 300) {
sane_word_array_bound(src->resolutions, 0, 300);
}
}
}
DONE:
if (err != NULL) {
devcaps_reset(caps);
airscan.h
+5
View File
@@ -1867,6 +1867,11 @@ sane_word_array_append (SANE_Word *a, SANE_Word w)
return a;
}
/* Drop array elements that outside of specified boundary
*/
void
sane_word_array_bound (SANE_Word *a, SANE_Word min, SANE_Word max);
/* Sort array of SANE_Word in increasing order
*/
void