diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2021-05-18 07:43:35 +0200 | 
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2021-05-18 07:43:35 +0200 | 
| commit | 9f8889f928ce86ba4a78659d378c6ba29bc9f735 (patch) | |
| tree | c9567cb0d015b68ce3da8d03472b6443f1cb1ca9 /backend/hp5400_internal.c | |
| parent | 446e9454b8cbe5b689149415d11d36e88442ca88 (diff) | |
| parent | 154785ab2d5df7ddc8c2cf813b773c340e5e2aea (diff) | |
Merge branch 'release/debian/1.0.32-1'debian/1.0.32-1
Diffstat (limited to 'backend/hp5400_internal.c')
| -rw-r--r-- | backend/hp5400_internal.c | 9 | 
1 files changed, 4 insertions, 5 deletions
| diff --git a/backend/hp5400_internal.c b/backend/hp5400_internal.c index 1d81358..322359a 100644 --- a/backend/hp5400_internal.c +++ b/backend/hp5400_internal.c @@ -21,8 +21,7 @@     GNU General Public License for more details.     You should have received a copy of the GNU General Public License -   along with this program; if not, write to the Free Software -   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA. +   along with this program.  If not, see <https://www.gnu.org/licenses/>.     As a special exception, the authors of SANE give permission for     additional uses of the libraries contained in this release of SANE. @@ -385,7 +384,7 @@ SetCalibration (int iHandle, int numPixels, unsigned int *low_vals[3],        i = j / numLoop;        /* This is obviously not quite right. The values on -       * the right are approximatly what windows sends */ +       * the right are approximately what windows sends */        k = (high_vals[0][i] > 0x4000) ? 1000000000 / high_vals[0][i] : 0;	/* 0x6700 */        pixel->highr[0] = k;        pixel->highr[1] = k >> 8; @@ -781,7 +780,7 @@ DoAverageScan (int iHandle, struct ScanRequest *req, int code,    HWParams.iXferHandle = iHandle;    if (InitScan2 (SCAN_TYPE_CALIBRATION, req, &HWParams, &res, 0, code) != 0) -    return -1;			/* No colour offseting, we want raw */ +    return -1;			/* No colour offsetting, we want raw */    length = htonl (res.xsize) / 6; @@ -1204,7 +1203,7 @@ InitScan2 (enum ScanType scantype, struct ScanRequest *req,    /* Protect scanner from damage. This stops stpuid errors.  It basically     * limits you to the scanner glass. Stuff like calibrations which need -   * more access do it safely by fiddling other paramters. Note you can +   * more access do it safely by fiddling other parameters. Note you can     * still break things by fiddling the ScanOffset, but that is not yet     * under user control */ | 
