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/gt68xx_high.c | |
| parent | 446e9454b8cbe5b689149415d11d36e88442ca88 (diff) | |
| parent | 154785ab2d5df7ddc8c2cf813b773c340e5e2aea (diff) | |
Merge branch 'release/debian/1.0.32-1'debian/1.0.32-1
Diffstat (limited to 'backend/gt68xx_high.c')
| -rw-r--r-- | backend/gt68xx_high.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/backend/gt68xx_high.c b/backend/gt68xx_high.c index 563323c..f077e5e 100644 --- a/backend/gt68xx_high.c +++ b/backend/gt68xx_high.c @@ -19,9 +19,7 @@ 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. @@ -979,9 +977,11 @@ gt68xx_scanner_read_line (GT68xx_Scanner * scanner, SANE_Status gt68xx_scanner_stop_scan (GT68xx_Scanner * scanner) { - gt68xx_line_reader_free (scanner->reader); - scanner->reader = NULL; - + if (scanner->reader) + { + gt68xx_line_reader_free (scanner->reader); + scanner->reader = NULL; + } return gt68xx_device_stop_scan (scanner->dev); } @@ -1015,7 +1015,7 @@ struct GT68xx_Afe_Values /** Calculate average black and maximum white * - * This function is used for CCD scanners. The black mark to the left ist used + * This function is used for CCD scanners. The black mark to the left is used * for the calculation of average black. The remaining calibration strip * is used for searching the segment whose white average is the highest. * @@ -2664,7 +2664,7 @@ gt68xx_read_calibration (GT68xx_Scanner * scanner) return SANE_STATUS_IO_ERROR; } - /* TODO we should check endiannes and word alignment in case of a home + /* TODO we should check endianness and word alignment in case of a home * directory used trough different archs */ /* TODO check for errors */ |