Wykres commitów

3578 Commity (d74d3bcd887d2a3d59ee96e04eb68f15c0a3b882)

Autor SHA1 Wiadomość Data
Olaf Meeuwissen c31cf62106 dc25: fix [-Wunused-but-set-variable] compiler warnings 2015-12-27 18:38:41 +09:00
Olaf Meeuwissen 43b296471b coolscan: fix [-Wunused-but-set-variable] compiler warnings 2015-12-27 18:38:41 +09:00
Olaf Meeuwissen 50ca4bc976 cardscan: fix [-Wunused-but-set-variable] compiler warning 2015-12-27 18:38:40 +09:00
Olaf Meeuwissen c2b7b1af74 canon636u: fix [-Wunused-but-set-variable] compiler warning 2015-12-27 18:38:40 +09:00
Olaf Meeuwissen e881843745 canon: fix [-Wunused-but-set-variable] compiler warnings 2015-12-27 18:38:40 +09:00
Olaf Meeuwissen 592430016c avision: fix [-Wunused-but-set-variable] compiler warning
The variable seems to have been superseded by conv_out_size in the
else branch of set_calib_data().
2015-12-27 18:38:40 +09:00
Olaf Meeuwissen 5b8fdd317f artec_eplus48u: fix [-Wunused-but-set-variable] compiler warning
This leaves the sane_close() implementation just as broken as it has
been from the initial commit sometime in 2002.
2015-12-27 18:38:17 +09:00
Olaf Meeuwissen ec1936713e artec_eplus48u: fix [-Wunused-but-set-variable] compiler warning
The variable was only used to silence a [-Wunused-parameter] warning.
2015-12-27 18:38:17 +09:00
Olaf Meeuwissen 5b21a24312 artec: fix [-Wunused-but-set-variable] compiler warning
The variable is used to assign return values but is not referenced by
anything itself.
2015-12-27 18:38:17 +09:00
Olaf Meeuwissen 674b75fc91 Improve readability of condition
This also fixes the following GCC warning:

  warning: logical not is only applied to the left hand side of comparison
2015-12-20 17:33:55 +09:00
Volker Diels-Grabsch baec5e0395 Use consistently __func__ instead of __FUNCTION__
Some parts of SANE used __FUNCTION__ while other parts used __func__.
Now, __func__ is used consistently throughout the SANE sources.  This
fixes all occurrences of the following GCC warning:

warning: ISO C does not support '__FUNCTION__' predefined identifier
2015-12-20 15:27:45 +09:00
Volker Diels-Grabsch 93298674d0 Merge all compatibility macros around __func__ and __FUNCTION__
Various parts of SANE introduced their own compatibility macros for
old compilers that don't support __func__.  Most of these definitions
are identical or have minor differences.  This patch replaces them
with a single instance in the central header file for backends.
2015-12-20 15:27:45 +09:00
Volker Diels-Grabsch 7c8c8e29be Remove dead code due to unused variables
This fixes some occurrences of the following GCC warning:

warning: variable '...' set but not used
2015-12-20 15:21:45 +09:00
Volker Diels-Grabsch 13b6faee2a Fix interface of helper function write_many
This fixes two occurrences of the following GCC warning:

warning: cast discards 'const' qualifier from pointer target type
2015-12-20 14:43:57 +09:00
Volker Diels-Grabsch 6aced758f4 Fix typos in comments
While reading through the SANE sources I noticed some annoying typos
in the comments.  This patch is my contribution to make the SANE
sources slightly more pleasant to read.
2015-12-20 14:43:56 +09:00
Alessandro Zummo 6d8b8d5aa6 epsonds: fix duplex w/ double feed detection 2015-12-15 16:17:53 +01:00
Stéphane Voltz 06d876f74e fix for #315050
- handle case where linesel is rounded to 0 when scan y resolution is
  below minimal scan resolution but higher than half of the minimum
2015-12-15 06:05:07 +01:00
Olaf Meeuwissen f1593204c7 Drop execute permission
Source code, description files and configuration templates should never
need to be executed.
2015-11-27 21:28:09 +09:00
Olaf Meeuwissen e094c5b43b Invert sense of sanei_thread validity check
Double negatives suck.
2015-11-24 18:19:31 +09:00
Olaf Meeuwissen fe12d31e68 Fix SANE_Pid related -Wsign-compare warnings
This may fix threading related issues on WIN32 platforms, BTW.
2015-11-24 18:19:31 +09:00
m. allan noah ed59056d40 canon_dr backend v54
- br_x and br_y locked to page_width/height until changed
2015-11-23 21:26:09 -05:00
m. allan noah d0ea697ab8 fujitsu backend v129
- br_x and br_y locked to page_width/height until changed
- add USB ID's for fi-6xxxLA and fi-6xxxZLA scanners
- add USB ID's for unsupported SP11xx scanners (genesys based)
2015-11-23 21:08:30 -05:00
m. allan noah e6a249e042 revert mustek_usb2 backend upgrade
Instead of 100+ revert commits, I've lumped everything into a
single commit. This removes all of dedf0ac30 through db7f038f1,
plus the parts of 497d59180 which were specific to mustek_usb2
2015-11-12 21:10:49 -05:00
Olaf Meeuwissen 21c5f4d814 Add missing #include for malloc() 2015-11-11 22:42:08 +09:00
Olaf Meeuwissen 7dc416b7ae Remove unnecessary cast 2015-11-11 22:42:08 +09:00
Olaf Meeuwissen 38153b33e1 Fix "discards 'const' qualifier from pointer target type" warning
The device2 variable is not modified so let's make that clear.
2015-11-11 22:41:42 +09:00
Olaf Meeuwissen d2576bbb94 Fix "discards 'const' qualifier from pointer target type" warnings
The cs3_xfree() functions is really just a checked call to free() so its
signature has been changed to match that.  The warnings that causes have
been fixed in the same way and on the same grounds as the previous commit.
2015-11-11 22:41:33 +09:00
Olaf Meeuwissen e65fd1b4cb Fix "discards 'const' qualifier from pointer target type" warnings
The resources pointed to have been acquired by the backend.  It is safe
to cast away the 'const' qualifier when releasing these resources.
2015-11-11 22:41:22 +09:00
m. allan noah 497d591806 automake for recent changes
updates to mustek_usb2, canon_dr and umax_pp require automake run
2015-11-08 17:17:37 -05:00
Jan Hauffa db7f038f10 Fix a bug introduced during refactoring that caused discolored stripes to appear at the left and right sides of the scan area. 2015-11-08 16:54:49 -05:00
Jan Hauffa a64477bf1a Remove USB 2.0 mode, as it causes horrible backtracking for resolutions > 300 dpi. 2015-11-08 16:54:49 -05:00
Jan Hauffa 98248f6088 properly add new handle to linked list 2015-11-08 16:54:49 -05:00
Jan Hauffa 3b48a6d105 fix integer overflow bug in image data conversion 2015-11-08 16:54:49 -05:00
Jan Hauffa d0ea79f000 Add model-specific functions for computing the number of motor steps. 2015-11-08 16:54:49 -05:00
Jan Hauffa 15fbbf60a6 Split SetMotorSteps into a function that computes the number of steps for the various motor states and and a function that writes the step counts to the controller's registers. 2015-11-08 16:54:49 -05:00
Jan Hauffa 70dcfa4ced Simplify SetMotorStepTable*. 2015-11-08 16:54:49 -05:00
Jan Hauffa 27b636d294 Provide model-specific function for computing the motor current. 2015-11-08 16:54:49 -05:00
Jan Hauffa 8f405f5a93 Update motor table generation according to new dumps. 2015-11-08 16:54:48 -05:00
Jan Hauffa 2fa054456e Detect USB controller type. 2015-11-08 16:54:48 -05:00
Jan Hauffa d8a203a693 Add function to compute scan motor table for 4800H48U, rearrange code in Asic_SetWindow. 2015-11-08 16:54:48 -05:00
Jan Hauffa ceb7d29690 Fix some misuse of SENSOR_DPI constant. 2015-11-08 16:54:48 -05:00
Jan Hauffa 30e3907156 Allow for model-specific parameters in mustek_usb2_high.c. 2015-11-08 16:54:48 -05:00
Jan Hauffa 47c56e3f19 Add some motor-related code for the Microtek 4800H48U. 2015-11-08 16:54:48 -05:00
Jan Hauffa 7b26e0e3fa Simplify SimpleMotorMove. 2015-11-08 16:54:48 -05:00
Jan Hauffa 0a1125895b Add some information about the values retrieved by GetChipStatus. 2015-11-08 16:54:48 -05:00
Jan Hauffa c691b02241 Remove restriction to 8-bit color in negative mode.
The only reason for that restriction was that the histogram stretching code, which has been removed earlier, could only handle 8-bit color.
2015-11-08 16:54:48 -05:00
Jan Hauffa 4ced7a900a Improve debug logging and fix a bug in TestDRAM. 2015-11-08 16:54:48 -05:00
Jan Hauffa e1c00bd9ab Introduce SetMotorCurrentAndPhase for Microtek scanner, fix old bug in simplification of Mustek variant. 2015-11-08 16:54:48 -05:00
Jan Hauffa 96b4950499 Register related fixes. 2015-11-08 16:54:48 -05:00
Jan Hauffa 5d556cd5e6 Introduce structure for specifying model-specific parameters on the ASIC level. 2015-11-08 16:54:48 -05:00
Jan Hauffa 529b6a1d6d Fix bug in device list handling. 2015-11-08 16:54:47 -05:00
Jan Hauffa 877f250b5c Resolve issue with debug logging. 2015-11-08 16:54:47 -05:00
Jan Hauffa 272c1d6fde Add preliminary model entry for the Microtek 4800H48U. 2015-11-08 16:54:47 -05:00
Jan Hauffa 7fda9bbf93 Introduce support for multiple scanners.
Keep all state local and ensure that all resources are freed by sane_exit. Ensure that each function returns only those error codes that are valid according to the SANE standard.
2015-11-08 16:54:47 -05:00
Jan Hauffa 6865eaf6ed Simplify sane_read, other fixes to mustek_usb2.c. 2015-11-08 16:54:47 -05:00
Jan Hauffa 63793907e2 Minor fixes to image processing. 2015-11-08 16:54:47 -05:00
Jan Hauffa bc203e8aa1 Sanitize option handling and add support for scanner buttons. 2015-11-08 16:54:47 -05:00
Jan Hauffa b2b3cf767a Use standard macros for byte swapping. 2015-11-08 16:54:47 -05:00
Jan Hauffa 281f53aa18 Remaining endian safety fixes. 2015-11-08 16:54:47 -05:00
Jan Hauffa 80b7249ebf Resolve minor thread safety problem. 2015-11-08 16:54:47 -05:00
Jan Hauffa de84f51270 Simplify row stride calculation in Asic_SetWindow(). 2015-11-08 16:54:47 -05:00
Jan Hauffa 7cd88d4122 Remove Scanner_ScanSuggest. 2015-11-08 16:54:47 -05:00
Jan Hauffa 3f5592ef8e Move global state variables of mustek_usb2_high.c into scanner structure. 2015-11-08 16:54:47 -05:00
Jan Hauffa 60a244ed1e Store size of shading table in ASIC structure. 2015-11-08 16:54:46 -05:00
Jan Hauffa ed1997b22f Do not test for NULL before calling free(). 2015-11-08 16:54:46 -05:00
Jan Hauffa 35c6a52834 Fix error propagation in mustek_usb2_high.c and a layering violation. 2015-11-08 16:54:46 -05:00
Jan Hauffa babee51689 Fix indentation of debug macros. 2015-11-08 16:54:46 -05:00
Jan Hauffa c0e44738a4 Simplify debug output in mustek_usb2.c. 2015-11-08 16:54:46 -05:00
Jan Hauffa c377a02453 Simplify debug output in mustek_usb2_high.c. 2015-11-08 16:54:46 -05:00
Jan Hauffa eebbe92c4e Simplify debug logging in mustek_usb2_asic.c. 2015-11-08 16:54:46 -05:00
Jan Hauffa 2c712f27c9 Remove uninformative function name prefixes, move gamma table creation into separate function. 2015-11-08 16:54:46 -05:00
Jan Hauffa c1dc16d709 Extensive changes to reduce the amount of global variables in mustek_usb2_high.c.
Might have made MustScanner_SetupScan less readable, though.
2015-11-08 16:54:46 -05:00
Jan Hauffa 9444bf1156 Reorganize some MustScanner_* functions. 2015-11-08 16:54:46 -05:00
Jan Hauffa bd7107ca05 Remove some unneeded global variables from mustek_usb2_high.c. 2015-11-08 16:54:46 -05:00
Jan Hauffa 589d6e15ee Endian-safe macros; moved remaining ASIC state into structure. 2015-11-08 16:54:46 -05:00
Jan Hauffa f89a7962de Fix indentation. 2015-11-08 16:54:46 -05:00
Jan Hauffa df045634cb Misc fixes. 2015-11-08 16:54:46 -05:00
Jan Hauffa 86f399bd21 Code in mustek_usb2.c should not use global state of mustek_usb2_high.c. 2015-11-08 16:54:45 -05:00
Jan Hauffa 74effd61fd Remove histogram stretching for negative images. 2015-11-08 16:54:45 -05:00
Jan Hauffa 4962b35abd Use prefix 'p' instead of 'lp', fix other style issues. 2015-11-08 16:54:45 -05:00
Jan Hauffa 9e2aabc976 If g_isCanceled is true, the thread has already been canceled. 2015-11-08 16:54:45 -05:00
Jan Hauffa a75bd3e8f7 Improve error handling in mustek_usb2_high.c. 2015-11-08 16:54:45 -05:00
Jan Hauffa 1d0f3ca42e Fix remaining comments. 2015-11-08 16:54:45 -05:00
Jan Hauffa 9226162537 Normalize naming of constants, structures, and enums. 2015-11-08 16:54:45 -05:00
Jan Hauffa d7ebb1553b Remove USB host type enum. 2015-11-08 16:54:45 -05:00
Jan Hauffa 41ac627e5f Get rid of unnecessary forward declarations. 2015-11-08 16:54:45 -05:00
Jan Hauffa da64a1fc1e First hack to build mustek_usb2* source files separately. 2015-11-08 16:54:45 -05:00
Jan Hauffa 3479acf538 Merge mustek_usb2_reflective/transparent.c into mustek_usb2_high.c. 2015-11-08 16:54:45 -05:00
Jan Hauffa a45931dd11 Remove MustScanner_GetScannerState. 2015-11-08 16:54:44 -05:00
Jan Hauffa c9516d5365 Merge Reflective_Reset, Transparent_Reset, and MustScanner_Prepare into new function MustScanner_Reset. 2015-11-08 16:54:44 -05:00
Jan Hauffa b2f52afa32 Further cleanup of mustek_usb2.c. 2015-11-08 16:54:44 -05:00
Jan Hauffa ccce2d4a9a Further cleanup of mustek_usb2.c. 2015-11-08 16:54:44 -05:00
Jan Hauffa 39141a4c02 Return SANE_STATUS_UNSUPPORTED unconditionally in sane_set_io_mode and sane_get_select_fd. 2015-11-08 16:54:44 -05:00
Jan Hauffa d9c1df0bb8 Remove vestigial support for custom gamma tables. 2015-11-08 16:54:44 -05:00
Jan Hauffa acf84e0c94 Clean up function StopScan. 2015-11-08 16:54:44 -05:00
Jan Hauffa 9158d10df9 Further simplification of MustScanner_Get*Line functions. 2015-11-08 16:54:44 -05:00
Jan Hauffa 1f6b405451 First attempt at simplifying the Get*Line functions. 2015-11-08 16:54:44 -05:00
Jan Hauffa a6b15f18cc Break remaining long lines. 2015-11-08 16:54:44 -05:00
Jan Hauffa 25242ff9c8 Clean up mustek_usb2_high.c. 2015-11-08 16:54:44 -05:00
Jan Hauffa c8982a9939 Do not use prefix "by" for byte variable names. 2015-11-08 16:54:44 -05:00