diff --git a/backend/canon_pp-dev.c b/backend/canon_pp-dev.c index df7c4aa87..0c577d86c 100644 --- a/backend/canon_pp-dev.c +++ b/backend/canon_pp-dev.c @@ -770,7 +770,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 diff --git a/backend/canon_pp.c b/backend/canon_pp.c index 822eaf175..5b93d9623 100644 --- a/backend/canon_pp.c +++ b/backend/canon_pp.c @@ -367,7 +367,7 @@ sane_init (SANE_Int *vc, SANE_Auth_Callback cb) continue; } - /* detect_mode suceeded, so the port is open. This beholdens + /* detect_mode succeeded, so the port is open. This beholdens * us to call ieee1284_close in any of the remaining error * cases in this loop. */ #if 0 @@ -456,7 +456,7 @@ sane_init (SANE_Int *vc, SANE_Auth_Callback cb) * * sane_get_devices() * - * Gives a list of devices avaialable. In our case, that's the linked + * Gives a list of devices available. In our case, that's the linked * list produced by sane_init. * *************************************************************************/ @@ -1222,7 +1222,7 @@ sane_read (SANE_Handle h, SANE_Byte *buf, SANE_Int maxlen, SANE_Int *lenp) /* At this point we have to read more data from the scanner - or the * scan has been cancelled, which means we have to call read_segment - * to leave the scanner consistant */ + * to leave the scanner consistent */ /* Decide how many lines we can fit into this buffer */ if (cs->vals[OPT_DEPTH] == 0) @@ -1464,7 +1464,7 @@ sane_exit (void) /* Should normally nullify pointers after freeing, but in * this case we're about to free the whole structure so - * theres not a lot of point. */ + * there's not a lot of point. */ /* Constraints (mostly) allocated when the scanner is opened */ if(dev->opt[OPT_TL_X].constraint.range) @@ -1701,7 +1701,7 @@ static SANE_Status init_device(struct parport *pp) /* * NOTE: Ranges and lists are actually set when scanner is opened, - * becase that's when we find out what sort of scanner it is + * because that's when we find out what sort of scanner it is */ DBG(100, "init_device: done opts\n"); diff --git a/backend/canon_pp.conf.in b/backend/canon_pp.conf.in index c12d76367..439537c8e 100644 --- a/backend/canon_pp.conf.in +++ b/backend/canon_pp.conf.in @@ -11,9 +11,9 @@ ieee1284 parport0 # Parameters are: # calibrate /path/to/calibration-file port-name # -# The format of port-name is dependant on your OS version. +# The format of port-name is dependent on your OS version. # -# If a file isn't speficied, the default name will be +# If a file isn't specified, the default name will be # ~/.sane/canon_pp-calibration-[port-name] calibrate ~/.sane/canon_pp-calibration-pp0 parport0