diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2021-02-16 18:25:42 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2021-02-16 18:25:42 +0100 |
| commit | 64ddd1a4dfcefd11f662f5cf4bb05b590d901a97 (patch) | |
| tree | 4303648095deff998ae20c2393b56db527742ac9 /backend/sm3600.c | |
| parent | 5793a221e112fa49073de0137d6bfa750a61b0a1 (diff) | |
| parent | ecaaf250cb33ff61f37a7b441f2337584a655350 (diff) | |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'backend/sm3600.c')
| -rw-r--r-- | backend/sm3600.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/backend/sm3600.c b/backend/sm3600.c index 8f8adfc..8542e3e 100644 --- a/backend/sm3600.c +++ b/backend/sm3600.c @@ -14,9 +14,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. @@ -672,7 +670,7 @@ SetupInternalParameters(TInstance *this) SANE_Status sane_get_parameters (SANE_Handle handle, SANE_Parameters *p) { - /* extremly important for xscanimage */ + /* extremely important for xscanimage */ TInstance *this; this=(TInstance*)handle; SetupInternalParameters(this); @@ -714,7 +712,7 @@ sane_start (SANE_Handle handle) if (this->state.bScanning) return SANE_STATUS_DEVICE_BUSY; rc=SetupInternalParameters(this); this->state.bCanceled=false; - if (!rc) rc=DoInit(this); /* oopsi, we should initalise :-) */ + if (!rc) rc=DoInit(this); /* oopsi, we should initialise :-) */ if (!rc && !this->bOptSkipOriginate) rc=DoOriginate(this,true); if (!rc) rc=DoJog(this,this->calibration.yMargin); if (rc) return rc; |