diff options
author | Doug Barton <dougb@FreeBSD.org> | 2006-05-26 23:50:11 +0000 |
---|---|---|
committer | Doug Barton <dougb@FreeBSD.org> | 2006-05-26 23:50:11 +0000 |
commit | 9ab82d60d82105cd57c38a2d3d2b00edfb534148 (patch) | |
tree | 128cf726daa92cd9ce854d84bb2725df07e1cb8d /print/hplip3/files/patch-scan_sane-pml.c | |
parent | Update portsnap to version 1.1, to reflect three months of development in (diff) |
Fix port to work on RELENG_4.
Submitted by: Anish Mistry <amistry@am-productions.biz> (maintainer)
Notes
Notes:
svn path=/head/; revision=163558
Diffstat (limited to 'print/hplip3/files/patch-scan_sane-pml.c')
-rw-r--r-- | print/hplip3/files/patch-scan_sane-pml.c | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/print/hplip3/files/patch-scan_sane-pml.c b/print/hplip3/files/patch-scan_sane-pml.c new file mode 100644 index 000000000000..0bb93d4eb03a --- /dev/null +++ b/print/hplip3/files/patch-scan_sane-pml.c @@ -0,0 +1,20 @@ +--- scan/sane/pml.c.orig Tue May 23 15:13:18 2006 ++++ scan/sane/pml.c Tue May 23 15:13:55 2006 +@@ -725,7 +725,7 @@ + IP_IMAGE_TRAITS traits; + IP_XFORM_SPEC xforms[IP_MAX_XFORMS], * pXform = xforms; + int stat = SANE_STATUS_DEVICE_BUSY; +- int i, bsize, state, wResult, index, r; ++ int i, bsize, state, wResult, index, r, mmWidth; + int oldStuff = (hpaio->preDenali || hpaio->fromDenali || hpaio->denali) ? 1 : 0; + + if (hpaio->cmd_channelid < 0) +@@ -919,7 +919,7 @@ + hpaio->scanParameters.lines = MILLIMETERS_TO_PIXELS(hpaio->bryRange.max, hpaio->effectiveResolution); + } + +- int mmWidth = PIXELS_TO_MILLIMETERS(traits.iPixelsPerRow, hpaio->effectiveResolution); ++ mmWidth = PIXELS_TO_MILLIMETERS(traits.iPixelsPerRow, hpaio->effectiveResolution); + + /* Set up X_CROP xform. */ + pXform->aXformInfo[IP_CROP_LEFT].dword = MILLIMETERS_TO_PIXELS( hpaio->effectiveTlx, hpaio->effectiveResolution ); |