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/apple.c | |
parent | 5793a221e112fa49073de0137d6bfa750a61b0a1 (diff) | |
parent | ecaaf250cb33ff61f37a7b441f2337584a655350 (diff) |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'backend/apple.c')
-rw-r--r-- | backend/apple.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/backend/apple.c b/backend/apple.c index 980edb4..328fd1e 100644 --- a/backend/apple.c +++ b/backend/apple.c @@ -16,9 +16,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. @@ -393,7 +391,7 @@ return SANE_STATUS_GOOD; if (status == SANE_STATUS_IO_ERROR) { -/* Now we are checking for Harware and Vendor Unique Errors for all models */ +/* Now we are checking for Hardware and Vendor Unique Errors for all models */ /* First check the common Error conditions */ if (result[18] & 0x80) @@ -1010,7 +1008,7 @@ calc_parameters (Apple_Scanner * s) Looks like for two distinct val (Fixed) values we get the same double. How come ? - This hack fixed the looping situtation. Unfortunately SIGSEGV + This hack fixed the looping situation. Unfortunately SIGSEGV remains when you touch the slice bars (thouhg not all the time). But it's OK if you select scan_area from the preview window (cool). @@ -1188,7 +1186,7 @@ mode_update (SANE_Handle handle, char *val) return SANE_STATUS_INVAL; } -/* Second hand dependancies of mode option */ +/* Second hand dependencies of mode option */ /* Looks like code doubling */ @@ -1546,7 +1544,7 @@ init_options (Apple_Scanner * s) /* Use volt_ref */ s->opt[OPT_VOLT_REF].name = "volt-ref"; s->opt[OPT_VOLT_REF].title = "Volt Reference"; - s->opt[OPT_VOLT_REF].desc ="It's brightness equivalant."; + s->opt[OPT_VOLT_REF].desc ="It's brightness equivalent."; s->opt[OPT_VOLT_REF].type = SANE_TYPE_BOOL; if (s->hw->ScannerModel!=COLORONESCANNER) s->opt[OPT_VOLT_REF].cap |= SANE_CAP_INACTIVE; |