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/coolscan.h | |
parent | 5793a221e112fa49073de0137d6bfa750a61b0a1 (diff) | |
parent | ecaaf250cb33ff61f37a7b441f2337584a655350 (diff) |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'backend/coolscan.h')
-rw-r--r-- | backend/coolscan.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/backend/coolscan.h b/backend/coolscan.h index 4f40aa4..b154743 100644 --- a/backend/coolscan.h +++ b/backend/coolscan.h @@ -13,9 +13,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. @@ -147,7 +145,7 @@ typedef struct Coolscan int LS; /* index in scanner_str */ int cont; /* continue although scanner is unknown */ - int verbose; /* 1,2=output informations */ + int verbose; /* 1,2=output information */ int asf; /* Automatic Slide Feeder enabled? */ int MUD; /* Measurement Unit Divisor (1200 or 2700) */ @@ -317,7 +315,7 @@ static char *scanner_str[] = #define known_scanners 4 -/* Comment this line if you havn't patched sane.h to include +/* Comment this line if you haven't patched sane.h to include SANE_FRAME_RGBA */ /* #define HAS_IRED 1 */ |