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/hp3900_config.c | |
parent | 5793a221e112fa49073de0137d6bfa750a61b0a1 (diff) | |
parent | ecaaf250cb33ff61f37a7b441f2337584a655350 (diff) |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'backend/hp3900_config.c')
-rw-r--r-- | backend/hp3900_config.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/backend/hp3900_config.c b/backend/hp3900_config.c index dba5302..daeb583 100644 --- a/backend/hp3900_config.c +++ b/backend/hp3900_config.c @@ -15,8 +15,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. @@ -52,7 +51,7 @@ static SANE_Int cfg_chipset_model_get(SANE_Int device); /* buttons for each scanner */ static SANE_Int cfg_buttons_get(struct st_buttons *reg); -/* area constrains for each scanner */ +/* area constraints for each scanner */ static SANE_Int cfg_constrains_get(struct st_constrains *constrain); /* spectrum clock generator for each scanner */ @@ -989,7 +988,7 @@ static void cfg_offset_get(SANE_Int sensortype, SANE_Int resolution, SANE_Int sc } } -/** SEC: Device constrains ---------- */ +/** SEC: Device constraints ---------- */ static SANE_Int cfg_constrains_get(struct st_constrains *constrain) { @@ -1003,7 +1002,7 @@ static SANE_Int cfg_constrains_get(struct st_constrains *constrain) struct st_reg reg[] = { - /* constrains are set in milimeters */ + /* constraints are set in millimeters */ /*device , reflective , negative , transparent */ /* , {{left, width, top, height}, {left, width, top, height}, {left, width, top, height}}}, */ { BQ5550 , {{ 0, 220, 0, 300}, { 88, 42, 0, 83}, { 88, 42, 0, 83}}}, |