summaryrefslogtreecommitdiff
path: root/backend/canon_pp-dev.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2021-02-16 18:25:42 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2021-02-16 18:25:42 +0100
commit64ddd1a4dfcefd11f662f5cf4bb05b590d901a97 (patch)
tree4303648095deff998ae20c2393b56db527742ac9 /backend/canon_pp-dev.c
parent5793a221e112fa49073de0137d6bfa750a61b0a1 (diff)
parentecaaf250cb33ff61f37a7b441f2337584a655350 (diff)
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'backend/canon_pp-dev.c')
-rw-r--r--backend/canon_pp-dev.c13
1 files changed, 2 insertions, 11 deletions
diff --git a/backend/canon_pp-dev.c b/backend/canon_pp-dev.c
index df7c4aa..7d7f7c1 100644
--- a/backend/canon_pp-dev.c
+++ b/backend/canon_pp-dev.c
@@ -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.
@@ -43,8 +41,6 @@
This file is part of the canon_pp backend, supporting Canon CanoScan
Parallel scanners and also distributed as part of the stand-alone driver.
- canon_pp-dev.c: $Revision$
-
Misc constants for Canon CanoScan Parallel scanners and high-level scan
functions.
@@ -84,11 +80,6 @@ static void DBG(int level, const char *format, ...)
}
#else
-/* Definitions which only apply to SANE compiles */
-#ifndef VERSION
-#define VERSION "$Revision$"
-#endif
-
#define DEBUG_DECLARE_ONLY
#include "canon_pp.h"
#include "../include/sane/sanei_config.h"
@@ -770,7 +761,7 @@ static void convdata(unsigned char *srcbuffer, unsigned char *dstbuffer,
for (count = 0; count < width; count++)
{
- /* The scanner stores data in a bizzare butchered 10-bit
+ /* The scanner stores data in a bizarre butchered 10-bit
format. I'll try to explain it in 100 words or less:
Scanlines are made up of groups of 4 pixels. Each group of