cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix HP 5370C flatbed resolution output.

Browse Source 
Bug reported by Byron Campbell and fix from usptream.
This commit is contained in:
ajacoutot 2020-12-20 09:56:36 +00:00
parent 12c0c6c8cb
commit dc6190da19
2 changed files with 70 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
graphics/sane-backends/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.94 2020/10/11 15:45:31 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.95 2020/12/20 09:56:36 ajacoutot Exp $
BROKEN-alpha= ICE hp5590.c:1141: error: unrecognizable insn
COMMENT= API for accessing scanners, backends
DISTNAME= sane-backends-1.0.31
REVISION= 0
REVISION= 1
SHARED_LIBS += sane 2.1 # unknown

68
graphics/sane-backends/patches/patch-backend_avision_c Normal file
View File

@ -0,0 +1,68 @@
$OpenBSD: patch-backend_avision_c,v 1.1 2020/12/20 09:56:36 ajacoutot Exp $
From 15e200a981bf2605e445ec642a070dbd5a7289de Mon Sep 17 00:00:00 2001
From: Ralph Little <skelband@gmail.com>
Date: Sat, 19 Dec 2020 17:27:23 -0800
Subject: [PATCH 1/2] avision: added some brackets to silence warnings about precedence ambiguity
From e111c485627b540ec14609f48cf3123ff7290543 Mon Sep 17 00:00:00 2001
From: Ralph Little <skelband@gmail.com>
Date: Sat, 19 Dec 2020 17:28:36 -0800
Subject: [PATCH 2/2] avision: added increment of the line variable in non-interpolated case
Index: backend/avision.c
--- backend/avision.c.orig
+++ backend/avision.c
@@ -4152,7 +4152,7 @@ attach (SANE_String_Const devname, Avision_ConnectionT
av_con.usb_status = AVISION_USB_UNTESTED_STATUS;
/* set known USB status type */
- if (attaching_hw && attaching_hw->feature_type & AV_INT_STATUS)
+ if (attaching_hw && (attaching_hw->feature_type & AV_INT_STATUS))
av_con.usb_status = AVISION_USB_INT_STATUS;
DBG (3, "attach: opening %s\n", devname);
@@ -6461,7 +6461,7 @@ get_background_raster (Avision_Scanner* s)
} /* end line pack */
/* deinterlace? */
- if (s->avdimen.interlaced_duplex && dev->hw->feature_type & AV_2ND_LINE_INTERLACED)
+ if (s->avdimen.interlaced_duplex && (dev->hw->feature_type & AV_2ND_LINE_INTERLACED))
{
uint8_t* deinterlaced = malloc (size * 2);
if (!deinterlaced)
@@ -6474,7 +6474,7 @@ get_background_raster (Avision_Scanner* s)
uint8_t* src_raster;
/* for the quirky devices and some resolutions the interlacing differs */
- if (dev->hw->feature_type & AV_BACKGROUND_QUIRK && s->avdimen.hw_xres >= 150)
+ if ((dev->hw->feature_type & AV_BACKGROUND_QUIRK) && (s->avdimen.hw_xres >= 150))
dst_i = i / 2 + ((i+1) % 2) * (lines / 2);
dst_raster = deinterlaced + bytes_per_line * dst_i;
@@ -7626,7 +7626,7 @@ reader_process (void *data)
/* interlaced? save the back data to the rear buffer */
if ( (deinterlace == STRIPE && absline % (lines_per_stripe*2) >= lines_per_stripe) ||
(deinterlace == HALF && absline >= total_size / s->avdimen.hw_bytes_per_line / 2) ||
- (deinterlace == LINE && absline & 0x1) ) /* last bit equals % 2 */
+ (deinterlace == LINE && (absline & 0x1)) ) /* last bit equals % 2 */
{
DBG (9, "reader_process: saving rear line %d to temporary file.\n", absline);
fwrite (ptr, s->avdimen.hw_bytes_per_line, 1, rear_fp);
@@ -7644,7 +7644,7 @@ reader_process (void *data)
DBG (9, "reader_process: after deinterlacing: useful_bytes: %d, stripe_fill: %d\n",
useful_bytes, stripe_fill);
}
- if (dev->hw->feature_type & AV_ADF_FLIPPING_DUPLEX && s->source_mode == AV_ADF_DUPLEX && !(s->page % 2) && !s->duplex_rear_valid) {
+ if ((dev->hw->feature_type & AV_ADF_FLIPPING_DUPLEX) && s->source_mode == AV_ADF_DUPLEX && !(s->page % 2) && !s->duplex_rear_valid) {
/* Here we flip the image by writing the lines from the end of the file to the beginning. */
unsigned int absline = (processed_bytes - stripe_fill) / s->avdimen.hw_bytes_per_line;
unsigned int abslines = absline + useful_bytes / s->avdimen.hw_bytes_per_line;
@@ -7838,6 +7838,7 @@ reader_process (void *data)
s->avdimen.hw_yres == s->avdimen.yres) /* No scaling */
{
fwrite (out_data, useful_bytes, 1, fp);
+ line += useful_bytes / s->avdimen.hw_bytes_per_line;
}
else /* Software scaling - watch out - this code bites back! */
{