Ordissimo
							
						 | 
						
							
							
							
							
								
							
								fa75c94b24
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into 'escl-adf-support'
							
							
							
							
							
							
							
							# Conflicts:
#   backend/escl/escl.c
#   backend/escl/escl.h
#   backend/escl/escl_capabilities.c
#   backend/escl/escl_crop.c
#   backend/escl/escl_newjob.c
#   backend/escl/escl_scan.c
#   backend/escl/escl_status.c 
							
						 | 
						
							2020-04-04 14:04:18 +00:00 | 
						
					
				
					
						
							
							
								 
								Olaf Meeuwissen
							
						 | 
						
							
							
							
							
								
							
								f8193494ad
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'newyearsbranch' into 'master'
							
							
							
							
							
							
							
							canon_lide70-sequel
See merge request sane-project/backends!315 
							
						 | 
						
							2020-04-04 04:35:45 +00:00 | 
						
					
				
					
						
							
							
								 
								thierry1970
							
						 | 
						
							
							
							
							
								
							
								59824f3d83
								
							
								
							
						 | 
						
							
							
								
								Fix style.
							
							
							
							
							
						 | 
						
							2020-04-03 09:37:49 +02:00 | 
						
					
				
					
						
							
							
								 
								thierry1970
							
						 | 
						
							
							
							
							
								
							
								8f5f815be1
								
							
								
							
						 | 
						
							
							
								
								Moves to the next page for the ADF.
							
							
							
							
							
						 | 
						
							2020-04-03 09:33:55 +02:00 | 
						
					
				
					
						
							
							
								 
								thierry1970
							
						 | 
						
							
							
							
							
								
							
								4f8a6991a9
								
							
								
							
						 | 
						
							
							
								
								Calculates the cropping offset with the ratio.
							
							
							
							
							
						 | 
						
							2020-04-03 09:23:49 +02:00 | 
						
					
				
					
						
							
							
								 
								thierry1970
							
						 | 
						
							
							
							
							
								
							
								dd9e30c814
								
							
								
							
						 | 
						
							
							
								
								Adjusts the cropping offset.
							
							
							
							
							
						 | 
						
							2020-04-03 09:22:51 +02:00 | 
						
					
				
					
						
							
							
								 
								Olaf Meeuwissen
							
						 | 
						
							
							
							
							
								
							
								9723a83b2c
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'zeroheure-master-patch-67644' into 'master'
							
							
							
							
							
							
							
							document JPEG compression level
See merge request sane-project/backends!389 
							
						 | 
						
							2020-04-02 11:05:58 +00:00 | 
						
					
				
					
						
							
							
								 
								Ordissimo
							
						 | 
						
							
							
							
							
								
							
								911e40ba4e
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'escl-fix-ratio-crop' into 'master'
							
							
							
							
							
							
							
							Escl fix ratio crop
See merge request sane-project/backends!390 
							
						 | 
						
							2020-04-02 09:08:24 +00:00 | 
						
					
				
					
						
							
							
								 
								thierry1970
							
						 | 
						
							
							
							
							
								
							
								7f10387ab0
								
							
								
							
						 | 
						
							
							
								
								Calculates the cropping offset with the ratio.
							
							
							
							
							
						 | 
						
							2020-04-02 10:41:59 +02:00 | 
						
					
				
					
						
							
							
								 
								thierry1970
							
						 | 
						
							
							
							
							
								
							
								6c0c360ce7
								
							
								
							
						 | 
						
							
							
								
								Adjusts the cropping offset.
							
							
							
							
							
						 | 
						
							2020-04-02 10:40:27 +02:00 | 
						
					
				
					
						
							
							
								 
								Xavier Brochard
							
						 | 
						
							
							
							
							
								
							
								f39a43953b
								
							
								
							
						 | 
						
							
							
								
								document JPEG compression level
							
							
							
							
							
						 | 
						
							2020-04-01 20:44:49 +00:00 | 
						
					
				
					
						
							
							
								 
								Povilas Kanapickas
							
						 | 
						
							
							
							
							
								
							
								6b318d8082
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'genesys-plustek' into 'master'
							
							
							
							
							
							
							
							genesys: Update Plustek model status
See merge request sane-project/backends!388 
							
						 | 
						
							2020-04-01 18:45:49 +00:00 | 
						
					
				
					
						
							
							
								 
								Povilas Kanapickas
							
						 | 
						
							
							
							
							
								
							
								8725559d4b
								
							
								
							
						 | 
						
							
							
								
								doc: Update plustek model status
							
							
							
							
							
						 | 
						
							2020-04-01 21:30:01 +03:00 | 
						
					
				
					
						
							
							
								 
								Povilas Kanapickas
							
						 | 
						
							
							
							
							
								
							
								101d27e8db
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'genesys-plustek' into 'master'
							
							
							
							
							
							
							
							genesys: Enable support for several Plustek OpticFilm scanner models
See merge request sane-project/backends!387 
							
						 | 
						
							2020-04-01 18:17:03 +00:00 | 
						
					
				
					
						
							
							
								 
								Povilas Kanapickas
							
						 | 
						
							
							
							
							
								
							
								0d5f5b54ed
								
							
								
							
						 | 
						
							
							
								
								genesys: Enable bcdDevice filtering
							
							
							
							
							
						 | 
						
							2020-04-01 20:57:01 +03:00 | 
						
					
				
					
						
							
							
								 
								Povilas Kanapickas
							
						 | 
						
							
							
							
							
								
							
								54f3b8efd1
								
							
								
							
						 | 
						
							
							
								
								genesys: Add support for early version of Plustek OpticFilm 7600i
							
							
							
							
							
						 | 
						
							2020-04-01 20:57:00 +03:00 | 
						
					
				
					
						
							
							
								 
								Povilas Kanapickas
							
						 | 
						
							
							
							
							
								
							
								bfd0b82d2b
								
							
								
							
						 | 
						
							
							
								
								genesys: Add support for Plustek OpticFilm 8100
							
							
							
							
							
						 | 
						
							2020-04-01 20:56:59 +03:00 | 
						
					
				
					
						
							
							
								 
								Povilas Kanapickas
							
						 | 
						
							
							
							
							
								
							
								a2a121ab8c
								
							
								
							
						 | 
						
							
							
								
								genesys: Add support for late version of Plustek OpticFilm 7600i
							
							
							
							
							
						 | 
						
							2020-04-01 20:56:58 +03:00 | 
						
					
				
					
						
							
							
								 
								Povilas Kanapickas
							
						 | 
						
							
							
							
							
								
							
								ea128674a6
								
							
								
							
						 | 
						
							
							
								
								genesys: Add support for early version of Plustek OpticFilm 7400
							
							
							
							
							
						 | 
						
							2020-04-01 20:56:57 +03:00 | 
						
					
				
					
						
							
							
								 
								Povilas Kanapickas
							
						 | 
						
							
							
							
							
								
							
								4a1667865a
								
							
								
							
						 | 
						
							
							
								
								genesys: Add support for Plustek OpticFilm 7200 (v2)
							
							
							
							
							
						 | 
						
							2020-04-01 20:56:56 +03:00 | 
						
					
				
					
						
							
							
								 
								Rolf Bensch
							
						 | 
						
							
							
							
							
								
							
								726e3e5407
								
							
								
							
						 | 
						
							
							
								
								pixma: backend version 0.27.6
							
							
							
							
							
						 | 
						
							2020-03-31 22:54:30 +02:00 | 
						
					
				
					
						
							
							
								 
								Rolf Bensch
							
						 | 
						
							
							
							
							
								
							
								05459de5e8
								
							
								
							
						 | 
						
							
							
								
								pixma: print characters @ pixma_hexdump()
							
							
							
							
							
						 | 
						
							2020-03-31 22:54:23 +02:00 | 
						
					
				
					
						
							
							
								 
								Rolf Bensch
							
						 | 
						
							
							
							
							
								
							
								e58641a430
								
							
								
							
						 | 
						
							
							
								
								Merge branch '258-fake-usb-playback-fails-with-pixma-backend' into 'master'
							
							
							
							
							
							
							
							Resolve "Fake USB Playback fails with pixma backend"
Closes issue sane-project/backends#258
See merge request sane-project/backends!353
Need merge requests sane-project/backends!380 and sane-project/backends!381 
							
						 | 
						
							2020-03-31 20:46:48 +00:00 | 
						
					
				
					
						
							
							
								 
								Rolf Bensch
							
						 | 
						
							
							
							
							
								
							
								c47e1c0bd5
								
							
								
							
						 | 
						
							
							
								
								sanei_usb: don't read data from timeouted interrupt
							
							
							
							
							
						 | 
						
							2020-03-31 20:01:10 +02:00 | 
						
					
				
					
						
							
							
								 
								Rolf Bensch
							
						 | 
						
							
							
							
							
								
							
								d2a43afce0
								
							
								
							
						 | 
						
							
							
								
								pixma: get device id if we replay a xml file
							
							
							
							
							
						 | 
						
							2020-03-31 20:01:10 +02:00 | 
						
					
				
					
						
							
							
								 
								Rolf Bensch
							
						 | 
						
							
							
							
							
								
							
								fa9d240e70
								
							
								
							
						 | 
						
							
							
								
								pixma: call sanei_usb_exit() on sane_exit()
							
							
							
							
							
							
							
							see: sane-project/backends#108 
							
						 | 
						
							2020-03-31 20:01:10 +02:00 | 
						
					
				
					
						
							
							
								 
								Povilas Kanapickas
							
						 | 
						
							
							
							
							
								
							
								2fe8e63597
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'sanei-usb-record-replay-descriptor' into 'master'
							
							
							
							
							
							
							
							sanei_usb: Add support for record/replay of get descriptor calls
See merge request sane-project/backends!381 
							
						 | 
						
							2020-03-31 17:55:02 +00:00 | 
						
					
				
					
						
							
							
								 
								Povilas Kanapickas
							
						 | 
						
							
							
							
							
								
							
								d6d3c0566f
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'sanei-usb-record-replay-multiple-open' into 'master'
							
							
							
							
							
							
							
							sanei_usb: Support recording conversations within multiple open-close calls
See merge request sane-project/backends!380 
							
						 | 
						
							2020-03-31 10:03:01 +00:00 | 
						
					
				
					
						
							
							
								 
								Olaf Meeuwissen
							
						 | 
						
							
							
							
							
								
							
								22b548bf22
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'escl-fix-capabilities' into 'master'
							
							
							
							
							
							
							
							escl - fix capabilities
See merge request sane-project/backends!384 
							
						 | 
						
							2020-03-30 11:42:02 +00:00 | 
						
					
				
					
						
							
							
								 
								Olaf Meeuwissen
							
						 | 
						
							
							
							
							
								
							
								b291a17934
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'fix-croping' into 'master'
							
							
							
							
							
							
							
							escl - Fix croping
See merge request sane-project/backends!385 
							
						 | 
						
							2020-03-30 11:40:07 +00:00 | 
						
					
				
					
						
							
							
								 
								Thierry HUCHARD
							
						 | 
						
							
							
							
							
								
							
								d06e42b08c
								
							
								
							
						 | 
						
							
							
								
								Correction of the zone cropping.
							
							
							
							
							
						 | 
						
							2020-03-29 21:42:38 +02:00 | 
						
					
				
					
						
							
							
								 
								Thierry HUCHARD
							
						 | 
						
							
							
							
							
								
							
								c6a8a54111
								
							
								
							
						 | 
						
							
							
								
								Offset correction
							
							
							
							
							
						 | 
						
							2020-03-29 21:42:10 +02:00 | 
						
					
				
					
						
							
							
								 
								Thierry HUCHARD
							
						 | 
						
							
							
							
							
								
							
								d5fdbb0c7d
								
							
								
							
						 | 
						
							
							
								
								Revert "Offset correction"
							
							
							
							
							
							
							
							This reverts commit d7df235a7e. 
							
						 | 
						
							2020-03-29 21:37:35 +02:00 | 
						
					
				
					
						
							
							
								 
								Thierry HUCHARD
							
						 | 
						
							
							
							
							
								
							
								062fb40cf4
								
							
								
							
						 | 
						
							
							
								
								Revert "Correction of the zone cropping."
							
							
							
							
							
							
							
							This reverts commit 67c7ef9c4e. 
							
						 | 
						
							2020-03-29 21:37:25 +02:00 | 
						
					
				
					
						
							
							
								 
								Thierry HUCHARD
							
						 | 
						
							
							
							
							
								
							
								67c7ef9c4e
								
							
								
							
						 | 
						
							
							
								
								Correction of the zone cropping.
							
							
							
							
							
						 | 
						
							2020-03-29 21:35:28 +02:00 | 
						
					
				
					
						
							
							
								 
								Thierry HUCHARD
							
						 | 
						
							
							
							
							
								
							
								d7df235a7e
								
							
								
							
						 | 
						
							
							
								
								Offset correction
							
							
							
							
							
						 | 
						
							2020-03-29 21:30:21 +02:00 | 
						
					
				
					
						
							
							
								 
								Thierry HUCHARD
							
						 | 
						
							
							
							
							
								
							
								6c855b7662
								
							
								
							
						 | 
						
							
							
								
								Fix build.
							
							
							
							
							
						 | 
						
							2020-03-29 16:20:16 +02:00 | 
						
					
				
					
						
							
							
								 
								Thierry HUCHARD
							
						 | 
						
							
							
							
							
								
							
								b4b1f2c748
								
							
								
							
						 | 
						
							
							
								
								Fix build.
							
							
							
							
							
						 | 
						
							2020-03-29 16:12:19 +02:00 | 
						
					
				
					
						
							
							
								 
								Ordissimo
							
						 | 
						
							
							
							
							
								
							
								9afdd20776
								
							
								
							
						 | 
						
							
							
								
								Fix initialisation variable.
							
							
							
							
							
						 | 
						
							2020-03-29 13:53:42 +00:00 | 
						
					
				
					
						
							
							
								 
								Thierry HUCHARD
							
						 | 
						
							
							
							
							
								
							
								3066241e90
								
							
								
							
						 | 
						
							
							
								
								Sets the capabilities of the device according to the output format.
							
							
							
							
							
						 | 
						
							2020-03-29 15:47:44 +02:00 | 
						
					
				
					
						
							
							
								 
								Olaf Meeuwissen
							
						 | 
						
							
							
							
							
								
							
								ee54d3935f
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'escl-formatext-pdf' into 'master'
							
							
							
							
							
							
							
							Add FormatExt for PDF.
See merge request sane-project/backends!356 
							
						 | 
						
							2020-03-29 12:32:33 +00:00 | 
						
					
				
					
						
							
							
								 
								Olaf Meeuwissen
							
						 | 
						
							
							
							
							
								
							
								07f28a1ca6
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'openbsd-hotplugd' into 'master'
							
							
							
							
							
							
							
							OpenBSD hotplugd(8)
See merge request sane-project/backends!375 
							
						 | 
						
							2020-03-29 12:29:56 +00:00 | 
						
					
				
					
						
							
							
								 
								Povilas Kanapickas
							
						 | 
						
							
							
							
							
								
							
								47689131a4
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'genesys-select-by-bcddevice' into 'master'
							
							
							
							
							
							
							
							genesys: Implement device filtering by bcdDevice value
See merge request sane-project/backends!383 
							
						 | 
						
							2020-03-28 21:31:29 +00:00 | 
						
					
				
					
						
							
							
								 
								Povilas Kanapickas
							
						 | 
						
							
							
							
							
								
							
								9698bfece7
								
							
								
							
						 | 
						
							
							
								
								genesys: Add support for matching devices by bcdDevice
							
							
							
							
							
						 | 
						
							2020-03-28 23:15:48 +02:00 | 
						
					
				
					
						
							
							
								 
								Povilas Kanapickas
							
						 | 
						
							
							
							
							
								
							
								0bdce7928f
								
							
								
							
						 | 
						
							
							
								
								genesys: Turn Genesys_USB_Device_Entry into a class
							
							
							
							
							
						 | 
						
							2020-03-28 23:15:47 +02:00 | 
						
					
				
					
						
							
							
								 
								Povilas Kanapickas
							
						 | 
						
							
							
							
							
								
							
								b89751605f
								
							
								
							
						 | 
						
							
							
								
								genesys: Add support for reading bcdDevice value
							
							
							
							
							
						 | 
						
							2020-03-28 23:15:46 +02:00 | 
						
					
				
					
						
							
							
								 
								Povilas Kanapickas
							
						 | 
						
							
							
							
							
								
							
								d6fa866818
								
							
								
							
						 | 
						
							
							
								
								sanei_usb: Add support for record/replay of get descriptor calls
							
							
							
							
							
						 | 
						
							2020-03-28 22:48:38 +02:00 | 
						
					
				
					
						
							
							
								 
								Povilas Kanapickas
							
						 | 
						
							
							
							
							
								
							
								59df3942f8
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'sanei-usb-record-indent-configuration' into 'master'
							
							
							
							
							
							
							
							sanei_usb: Indent the configuration section in recorded xml
See merge request sane-project/backends!382 
							
						 | 
						
							2020-03-28 20:42:38 +00:00 | 
						
					
				
					
						
							
							
								 
								Povilas Kanapickas
							
						 | 
						
							
							
							
							
								
							
								77886e6387
								
							
								
							
						 | 
						
							
							
								
								sanei_usb: Return correct error code in replay code path
							
							
							
							
							
						 | 
						
							2020-03-28 22:21:19 +02:00 | 
						
					
				
					
						
							
							
								 
								Povilas Kanapickas
							
						 | 
						
							
							
							
							
								
							
								770b204702
								
							
								
							
						 | 
						
							
							
								
								sanei_usb: Support devices that are being opened multiple times
							
							
							
							
							
						 | 
						
							2020-03-28 22:13:44 +02:00 |