diff --git a/backend/umax-scsidef.h b/backend/umax-scsidef.h index ddb04bb20..749869c14 100644 --- a/backend/umax-scsidef.h +++ b/backend/umax-scsidef.h @@ -699,7 +699,7 @@ static unsigned char window_descriptor_blockC[] = /* 0x48 */ 0x00, 0x00, 0x00, 0x00, /* Line Count */ #define set_WD_line_count(sb, val) putnbyte(sb + 0x48, val, 4) -/* 0x4c */ 4, 176, /* x coordiante base 1200 (pts/inch) */ +/* 0x4c */ 4, 176, /* x coordinate base 1200 (pts/inch) */ #define set_WD_x_coordinate_base(sb, val) putnbyte(sb + 0x4c, val, 2) /* 0x4e */ 4, 176, /* y coordinate base 1200 (pts/inch) */ diff --git a/backend/umax-usb.c b/backend/umax-usb.c index 75f47396d..f0fe71cb3 100644 --- a/backend/umax-usb.c +++ b/backend/umax-usb.c @@ -231,7 +231,7 @@ static SANE_Status pv8630_init_umaxusb_scanner(int fd) * sanei_umaxusb_req_wait() and sanei_umaxusb_req_enter() * * I don't know if it is possible to queue the reads to the - * scanner. So The queing is disabled. The performance does not seems + * scanner. So The queueing is disabled. The performance does not seems * to be bad anyway. */ @@ -275,7 +275,7 @@ sanei_umaxusb_open (const char *dev, int *fdp, SANE_Word vendor; SANE_Word product; - /* We have openned the device. Check that it is a USB scanner. */ + /* We have opened the device. Check that it is a USB scanner. */ if (sanei_usb_get_vendor_product (*fdp, &vendor, &product) != SANE_STATUS_GOOD) { /* This is not a USB scanner, or SANE or the OS doesn't support it. */ sanei_usb_close(*fdp); diff --git a/backend/umax.c b/backend/umax.c index 94f8aa4e6..783703e4c 100644 --- a/backend/umax.c +++ b/backend/umax.c @@ -64,11 +64,11 @@ . . - sane_get_option_descriptor() : get option information . . - sane_control_option() : change option values . . - . . - sane_start() : start image aquisition + . . - sane_start() : start image acquisition . . - sane_get_parameters() : returns actual scan-parameters . . - sane_read() : read image-data (from pipe) in ADF mode this is done often: - . . - sane_start() : start image aquisition + . . - sane_start() : start image acquisition . . - sane_get_parameters() : returns actual scan-parameters . . - sane_read() : read image-data (from pipe) @@ -1986,7 +1986,7 @@ static SANE_Status umax_queue_read_image_data_req(Umax_Device *dev, unsigned int set_R_datatype_code(sread.cmd, R_datatype_imagedata); /* set datatype */ dev->length_queued[bufnr] = length; /* set length request */ - dev->length_read[bufnr] = length; /* set length request, can be changed asyncronous by umax_scsi_req_enter */ + dev->length_read[bufnr] = length; /* set length request, can be changed asynchronous by umax_scsi_req_enter */ status = umax_scsi_req_enter(dev, sread.cmd, sread.size, dev->buffer[bufnr], &(dev->length_read[bufnr]), &(dev->queue_id[bufnr])); if (status) @@ -3219,7 +3219,7 @@ static int umax_identify_scanner(Umax_Device *dev) memcpy(dev->buffer[0]+0x24, inq_data.inquiry, inq_data.inquiry_len-0x24); /* correct variables */ - set_inquiry_sc_uta(dev->buffer[0], get_inquiry_transavail(dev->buffer[0])); /* transparancy available ? */ + set_inquiry_sc_uta(dev->buffer[0], get_inquiry_transavail(dev->buffer[0])); /* transparency available ? */ set_inquiry_sc_adf(dev->buffer[0], get_inquiry_scanmode(dev->buffer[0])); /* automatic document feeder available ? */ set_inquiry_length(dev->buffer[0], inq_data.inquiry_len); @@ -3934,7 +3934,7 @@ static int umax_check_values(Umax_Device *dev) { if ( (dev->colormode != RGB) || (dev->three_pass != 0) ) { - dev->do_color_ordering = 0; /* color ordering not necessery */ + dev->do_color_ordering = 0; /* color ordering not necessary */ } } @@ -7946,7 +7946,7 @@ SANE_Status sane_start(SANE_Handle handle) umax_set_window_param(scanner->device); status = umax_start_scan(scanner->device); - if (status) /* errror */ + if (status) /* error */ { umax_give_scanner(scanner->device); /* reposition and release scanner */ return status; @@ -7967,13 +7967,13 @@ SANE_Status sane_start(SANE_Handle handle) } status = umax_do_calibration(scanner->device); - if (status) /* errror */ + if (status) /* error */ { umax_give_scanner(scanner->device); /* reposition and release scanner */ return status; } - if (scanner->device->pause_after_calibration) /* may be usefull */ + if (scanner->device->pause_after_calibration) /* may be useful */ { DBG(DBG_info2,"pause after calibration %d msec ...\n", scanner->device->pause_after_calibration); usleep(((long) scanner->device->pause_after_calibration) * 1000); /* time in ms */ diff --git a/backend/umax.conf.in b/backend/umax.conf.in index 06b2750f4..d30d0a3ea 100644 --- a/backend/umax.conf.in +++ b/backend/umax.conf.in @@ -63,7 +63,7 @@ # 1 = enabled (same values for red, green and blue) #options exposure-time-rgb-bind 0 -# define if shading data shall be inverted befor sending it back to the scanner +# define if shading data shall be inverted before sending it back to the scanner # -1 = automatically set by driver - if known # 0 = disabled # 1 = enabled diff --git a/backend/umax.h b/backend/umax.h index e6b83fdb4..9f72c4616 100644 --- a/backend/umax.h +++ b/backend/umax.h @@ -183,7 +183,7 @@ enum Umax_Option /* LIST OF AVAILABLE SCANNERS, THE VALUES LISTED HERE ARE THE SAME FOR DIFFERENT APPLICATIONS THAT USE THE SAME DEVICE */ -/* Umax_Device contains values relevant for the device that are not intersting for the sane interface */ +/* Umax_Device contains values relevant for the device that are not interesting for the sane interface */ typedef struct Umax_Device { @@ -354,21 +354,21 @@ typedef struct Umax_Device int use_exposure_time_def_b; /* exposure time default */ int wdb_len; /* use this length of WDB */ - unsigned int width_in_pixels; /* thats the wanted width in pixels */ - unsigned int length_in_pixels; /* thats the wanted length in pixels */ - unsigned int scanwidth; /* thats the width in pixels at x_coordinate_base dpi */ - unsigned int scanlength; /* thats the length in pixels at y_coordinate_base dpi */ + unsigned int width_in_pixels; /* that's the wanted width in pixels */ + unsigned int length_in_pixels; /* that's the wanted length in pixels */ + unsigned int scanwidth; /* that's the width in pixels at x_coordinate_base dpi */ + unsigned int scanlength; /* that's the length in pixels at y_coordinate_base dpi */ unsigned int bytes_per_color; /* bytes per each color */ unsigned int x_resolution; /* scan-resolution for x in dpi */ unsigned int y_resolution; /* scan-resolution for y in dpi */ double scale_x; /* x-scaling of optical resolution */ double scale_y; /* y-scaling of optical resolution */ - int upper_left_x; /* thats the left edge in points at 1200pt/inch */ - int upper_left_y; /* thats the top edge in points at 1200pt/inch */ + int upper_left_x; /* that's the left edge in points at 1200pt/inch */ + int upper_left_y; /* that's the top edge in points at 1200pt/inch */ - unsigned int x_coordinate_base; /* x base in pixels/inch, normaly 1200 */ - unsigned int y_coordinate_base; /* y base in pixels/inch, normaly 1200 */ + unsigned int x_coordinate_base; /* x base in pixels/inch, normally 1200 */ + unsigned int y_coordinate_base; /* y base in pixels/inch, normally 1200 */ unsigned int bits_per_pixel; /* number of bits per pixel */ int bits_per_pixel_code; /* 1 = 24bpp, 4 = 30 bpp, 8 = 36 bpp */ @@ -396,7 +396,7 @@ typedef struct Umax_Device int adf; /* 1 if ADF turned on */ int uta; /* 1 if UTA turned on */ int calibration; /* calibration :0=ignore, 1=driver, 2=by image */ - int low_byte_first; /* 10 bit mode: 0=high byte frist, 1=low byte frist */ + int low_byte_first; /* 10 bit mode: 0=high byte first, 1=low byte first */ int colormode; /* LINEART, HALFTONE, GRAYSCALE or RGB */ # define LINEART 1 # define HALFTONE 2 diff --git a/doc/umax/sane-umax-astra-doc.html b/doc/umax/sane-umax-astra-doc.html index 0b9401995..d59fe3da5 100644 --- a/doc/umax/sane-umax-astra-doc.html +++ b/doc/umax/sane-umax-astra-doc.html @@ -557,7 +557,7 @@ Supported scanners:
*** Astra 6400 and 6450 are firewire scanners: not tested.

-UTA = Umax Transparancy Adapter, ADF = Automatic Document Feeder +UTA = Umax Transparency Adapter, ADF = Automatic Document Feeder
(X = supported by scanner, incl = is included)
diff --git a/doc/umax/sane-umax-config-doc.html b/doc/umax/sane-umax-config-doc.html index a26907941..57be082e0 100644 --- a/doc/umax/sane-umax-config-doc.html +++ b/doc/umax/sane-umax-config-doc.html @@ -121,7 +121,7 @@ and how you have to set the permissions of that device, have a look at

When the generic scsi driver of the system supports selection of scsi buffer sizes the umax backend calculates the scsi buffer -sizes in dependance of the numbers of bytes per scanline. +sizes in dependence of the numbers of bytes per scanline. With scsi-buffer-size-min and scsi-buffer-size-max the scsi buffer size can be defined in a range between 4KB and 1MB. Especially the minimum value is very important. If this value is @@ -150,7 +150,7 @@ work you can set the option force-preview-bit-rgb 1. This always sets the preview bit when acquiring a color scan. The image quality may be reduced.

-Some scanners (especally very old scanners) may need the options +Some scanners (especially very old scanners) may need the options slow-speed and/or care-about-smearing. The value -1 uses the value defined by the driver, 0 disables the feature, 1 enables the feature. Do not change these options unless @@ -411,7 +411,7 @@ export SANE_DEBUG_UMAX=8


-This page has been changed on 27th. feburary 2001 +This page has been changed on 27th. february 2001

diff --git a/doc/umax/sane-umax-mirage-doc.html b/doc/umax/sane-umax-mirage-doc.html index 5d1598267..a98f288fa 100644 --- a/doc/umax/sane-umax-mirage-doc.html +++ b/doc/umax/sane-umax-mirage-doc.html @@ -258,7 +258,7 @@ series:
* Mirage D-16L scanners allow scanning up to 800x800 / 1600x1600 dpi.

-UTA = Umax Transparancy Adapter, ADF = Automatic Document Feeder +UTA = Umax Transparency Adapter, ADF = Automatic Document Feeder
(X = supported by scanner, incl = is included)
diff --git a/doc/umax/sane-umax-others-doc.html b/doc/umax/sane-umax-others-doc.html index e1ed10d6e..9c0c072f3 100644 --- a/doc/umax/sane-umax-others-doc.html +++ b/doc/umax/sane-umax-others-doc.html @@ -217,7 +217,7 @@ and USB- scanners are not supported!

-

UTA = Umax Transparancy Adapter, ADF = Automatic Document Feeder +

UTA = Umax Transparency Adapter, ADF = Automatic Document Feeder
(X = supported by scanner, incl = is included)

diff --git a/doc/umax/sane-umax-powerlook-doc.html b/doc/umax/sane-umax-powerlook-doc.html index 23eb3dc81..47b45864b 100644 --- a/doc/umax/sane-umax-powerlook-doc.html +++ b/doc/umax/sane-umax-powerlook-doc.html @@ -517,7 +517,7 @@ Supported scanners: * Powerlook 1100 is a firewire scanner: not tested

-UTA = Umax Transparancy Adapter, ADF = Automatic Document Feeder +UTA = Umax Transparency Adapter, ADF = Automatic Document Feeder
(X = supported by scanner, incl = is included)
diff --git a/doc/umax/sane-umax-scanner-clones-doc.html b/doc/umax/sane-umax-scanner-clones-doc.html index f43d7eb86..b6cc265cc 100644 --- a/doc/umax/sane-umax-scanner-clones-doc.html +++ b/doc/umax/sane-umax-scanner-clones-doc.html @@ -686,7 +686,7 @@ Here is a list of the UMAX-compatible scanners:

* Scanner is able to scan up to 1200 x 1200 dpi. -

UTA = Umax Transparancy Adapter, ADF = Automatic Document Feeder +

UTA = Umax Transparency Adapter, ADF = Automatic Document Feeder
(X = supported by scanner, incl = is included)

@@ -1028,7 +1028,7 @@ Here is a list of the UMAX-compatible scanners:

* Scanner is able to scan up to 1200 x 1200 dpi. -

UTA = Umax Transparancy Adapter, ADF = Automatic Document Feeder +

UTA = Umax Transparency Adapter, ADF = Automatic Document Feeder
(X = supported by scanner, incl = is included)


diff --git a/doc/umax/sane-umax-standard-options-doc.html b/doc/umax/sane-umax-standard-options-doc.html index b80ca4087..4cba2d226 100644 --- a/doc/umax/sane-umax-standard-options-doc.html +++ b/doc/umax/sane-umax-standard-options-doc.html @@ -82,7 +82,7 @@ is an example of the frontend


The options Gamma, brightness, contrast and negative in the main window come from xsane that calculates a gamma table using this values. -These values are corelated to highlight, midlight and shadow sliders in +These values are correlated to highlight, midlight and shadow sliders in the Histogram window.
diff --git a/doc/umax/sane-umax-uc-doc.html b/doc/umax/sane-umax-uc-doc.html index a894b472b..9fd1e2e64 100644 --- a/doc/umax/sane-umax-uc-doc.html +++ b/doc/umax/sane-umax-uc-doc.html @@ -595,7 +595,7 @@ Supported scanners:

-

UTA = Umax Transparancy Adapter, ADF = Automatic Document Feeder +

UTA = Umax Transparency Adapter, ADF = Automatic Document Feeder
(X = supported by scanner, incl = is included) diff --git a/doc/umax/sane-umax-vista-doc.html b/doc/umax/sane-umax-vista-doc.html index a4e68a44e..67ff1a160 100644 --- a/doc/umax/sane-umax-vista-doc.html +++ b/doc/umax/sane-umax-vista-doc.html @@ -599,7 +599,7 @@ Supported scanners:

* Supervista S12 scanners allow scanning up to 1200x1200 dpi. -

UTA = Umax Transparancy Adapter, ADF = Automatic Document Feeder +

UTA = Umax Transparency Adapter, ADF = Automatic Document Feeder
(X = supported by scanner, incl = is included) diff --git a/doc/umax/umax.CHANGES b/doc/umax/umax.CHANGES index 79cca893a..b8018a123 100644 --- a/doc/umax/umax.CHANGES +++ b/doc/umax/umax.CHANGES @@ -5,9 +5,9 @@ umax -> sane-0.6: ----------------- * umax-sane-backend created: - - umax.c splitted in: + - umax.c split in: umax-cli.c, umax-scsi.c, umax-driver.c, umax-text.c - - umax.h splitted in: + - umax.h split in: umax-scanner.h, umax-scsi.h, umax-scsidef.h, umax-struct.h - outputs done by DBG(level,msg,args...) defined in debug.h - scsi-calls changed to sane-format (of sane-0.57) @@ -91,7 +91,7 @@ sane-0.6 / 0.61 / 0.62 -> 0.63 * reset adf and uta flag when not used (in sane_start) - * added possibilty to change calibration-mode if available + * added possibility to change calibration-mode if available * added send_halftone_pattern to umax-scsi.c @@ -119,7 +119,7 @@ sane-0.6 / 0.61 / 0.62 -> 0.63 and added missing 3 wid-bytes in scan.cmd * removed parameter color in three_pass_function_headers, - the color ist taken from us->three_pass_color now. + the color is taken from us->three_pass_color now. sane-0.63/0.64/0.65 -> 0.66 @@ -189,7 +189,7 @@ sane-0.66 -> 0.67 * removed bug (wrong length for 10 bit-gamma) in send_gamma_data - * changed all buffer-definitions to unsigned char and insterted + * changed all buffer-definitions to unsigned char and inserted type conversions, so there are no more warnings because of typemismatches. @@ -201,7 +201,7 @@ sane-0.67 -> 0.68 * changed open config to fp = sanei_config_open(UMAX_CONFIG_FILE) - * changed all set OPT...BIND commands, endless-loop happend in sane-0.67 + * changed all set OPT...BIND commands, endless-loop happened in sane-0.67 =>ane-0.67-umax-fix.diff.gz after that patch changed same for ten_bit_mode @@ -232,7 +232,7 @@ sane-0.68 -> 0.69 * changed name: umax_read_data_block -> umax_read_image_data - * changed length offest in do_inquiry from 5 to 4 + * changed length offset in do_inquiry from 5 to 4 and changed set_inquiry_length-offset from 5 to 4 * added calib_lines to structure US and added it to @@ -278,7 +278,7 @@ sane-0.69 -> 0.70 * moved reader_process from umax.c to umax-scsi.c and added routine for color ordering. - * reset length offest in do_inquiry from 4 to 5 + * reset length offset in do_inquiry from 4 to 5 and set_inquiry_length-offset from 4 to 5 because umax-S6E didn't work with it! @@ -395,7 +395,7 @@ sane-0.73 -> 0.74 There must'nt be a "wait_scanner" in calibration by driver routine!!! * added usage of driver internal values for calibration by driver if - the scanner does not give back the informations about the shading data: + the scanner does not give back the information about the shading data: width = dev->width * dev->inquiry_optical_res ( * 3 in RGB-mode ) * added 2 calibration-routines: @@ -497,7 +497,7 @@ build-2 -> build-3 (sane-1.0.1) * inversion of calibration is automatically set for Astra 6X0S and Vista S6E - * check for machine endianess is done only at backend start now! + * check for machine endianness is done only at backend start now! * made umax_do request_sense static @@ -566,7 +566,7 @@ build-7 -> build-8 * for Mirage D-16L the driver does not wait any more until scanner is repositioned this is experimental, it may work with other scanners too! - * Mirage D-16L does not give back informations for calibration by driver, + * Mirage D-16L does not give back information for calibration by driver, added new modus that "guesses" the values for Mirage D-16L. * Added read_shading_data to 16 bit calibration routine and made a routine for @@ -594,7 +594,7 @@ build-8 -> build-9 * gamma table is disabled in lineart and halftone modes - * if image is transmitted completly sane_read (close_pipe) + * if image is transmitted completely sane_read (close_pipe) returns with SANE_STATUS_GOOD in adf mode and in any other case with SANE_STATUS_EOF @@ -735,7 +735,7 @@ build-19 -> build-20 * added variable calibration_width_offset, Mirage D-16L offset of 308 is defined there and added offset of 28 for PowerLook III - * umax_do_calibration: guessed calibration data vaules use 2 bytes/color if scanner + * umax_do_calibration: guessed calibration data values use 2 bytes/color if scanner supports gamma input bit depth supports 2 bytes/color * calibration by driver now does work for PowerLook III @@ -780,7 +780,7 @@ build-21 -> build-22 higher scsi-ID (=priority) does scan without stops, the other scanner has to wait long time between the scsi-read commands, it also is possible to give - bothe scanners different scsi command queueing depth). + both scanners different scsi command queueing depth). * prepared replacement of pipe by sanei_ipc_* routines @@ -915,7 +915,7 @@ build-25 -> build-26 * added Mirage II as supported scanner * added routine umax_set_max_geometry that defines available surface - and resolution in dependance of scansource and double optical resolution + and resolution in dependence of scansource and double optical resolution (before this bugfix the change of dor mode overwrote the settings of scansource and vice versa) @@ -927,7 +927,7 @@ build-25 -> build-26 * sane_exit does free devlist - * added some options for Powerlook 3000 - still is not completly supported + * added some options for Powerlook 3000 - still is not completely supported build-26 -> build-27 @@ -1140,7 +1140,7 @@ build-41 -> build-42 * replaced fork() routines by sanei_thread routines - * added call sanei_scsi_req_flush_all(); to do_cancel - in threaded case this is not done when reader_process is cancled + * added call sanei_scsi_req_flush_all(); to do_cancel - in threaded case this is not done when reader_process is canceled * in reader_process: marked freed scsi buffers as freed(NULL). This is necessary when reader_process is run as thread! @@ -1156,7 +1156,7 @@ build-42 -> build-43 build-43 -> build-44 -------------------- - * the sense_hanlder stores the sense data in buffer[0] when valid sense data is avialable + * the sense_hanlder stores the sense data in buffer[0] when valid sense data is available * do_calibration: - corrected bug in reading calibration width from scanner (added /bytespp) @@ -1167,5 +1167,5 @@ build-43 -> build-44 build-44 -> build-45 -------------------- - * added defualt options for Linotype Opal2 + * added default options for Linotype Opal2 * changed bug in highlight-blue function (using green value) diff --git a/doc/umax/umax.FAQ b/doc/umax/umax.FAQ index 2ffbdfd84..84d217c74 100644 --- a/doc/umax/umax.FAQ +++ b/doc/umax/umax.FAQ @@ -64,7 +64,7 @@ A: There are at least two kind of scsi controller cards that Q: I use linux with a NCR/Symbios logic SCSI-Controller, sane does not work right. -A: There are two differen drivers in the linux Kernel/modules. +A: There are two different drivers in the linux Kernel/modules. Use the BSD-driver ncr53c8xx or sym53c8xx. ------------------------------------------------------------------------------- @@ -141,5 +141,5 @@ A: The optimization set by "-O2" makes problems, try which one of the following ------------------------------------------------------------------------------- -You find a lot of tips and informations in the internet. E.g. take a look +You find a lot of tips and information on the internet. E.g. take a look at http://www.scantips.com