Merge branch 'feature/upstream' into develop

5 files changed, 0 insertions, 250 deletions

diff --git a/doc/figs/area.fig b/doc/figs/area.fig
deleted file mode 100644
index d0e62e4..0000000
--- a/doc/figs/area.fig
+++ /dev/null
@@ -1,36 +0,0 @@
-#FIG 3.1
-Portrait
-Center
-Inches
-1200 2
-6 1650 1650 1800 1800
-2 1 0 1 -1 7 0 0 -1 0.000 0 0 -1 0 0 2
-	 1725 1650 1725 1800
-2 1 0 1 -1 7 0 0 -1 0.000 0 0 -1 0 0 2
-	 1650 1725 1800 1725
--6
-6 3300 2700 3450 2850
-2 1 0 1 -1 7 0 0 -1 0.000 0 0 -1 0 0 2
-	 3375 2700 3375 2850
-2 1 0 1 -1 7 0 0 -1 0.000 0 0 -1 0 0 2
-	 3300 2775 3450 2775
--6
-6 1725 1725 3375 2775
-2 2 0 0 7 7 10 0 18 0.000 0 0 -1 0 0 5
-	 1725 1725 3375 1725 3375 2775 1725 2775 1725 1725
-4 1 -1 10 0 16 12 0.0000 4 105 840 2550 2302 scan area\001
--6
-2 2 0 2 -1 7 0 0 -1 0.000 0 0 -1 0 0 5
-	 1200 675 4275 675 4275 3375 1200 3375 1200 675
-2 1 0 1 -1 7 10 0 16 0.000 0 0 -1 1 0 2
-	2 1 1.00 60.00 120.00
-	 1200 525 1200 3825
-2 1 0 1 -1 7 10 0 16 0.000 0 0 -1 1 0 2
-	2 1 1.00 60.00 120.00
-	 1050 675 4650 675
-4 1 -1 10 0 16 12 0.0000 4 180 1020 3375 3150 bottom-right\001
-4 1 -1 10 0 16 12 0.0000 4 180 615 1725 1500 top-left\001
-4 1 -1 10 0 16 12 0.0000 4 135 1080 2700 1050 scan surface\001
-4 1 -1 10 0 16 12 0.0000 4 150 105 1050 3600 y\001
-4 1 -1 10 0 16 12 0.0000 4 105 90 4425 525 x\001
-4 1 -1 10 0 16 12 0.0000 4 135 105 1080 585 0\001
diff --git a/doc/figs/flow.fig b/doc/figs/flow.fig
deleted file mode 100644
index 3abcc0b..0000000
--- a/doc/figs/flow.fig
+++ /dev/null
@@ -1,40 +0,0 @@
-#FIG 3.1
-Portrait
-Center
-Inches
-1200 2
-6 4200 7305 9945 7575
-4 0 -1 0 0 17 18 0.0000 4 270 1500 4200 7515 - go back to\001
-4 0 -1 0 0 16 18 0.0000 4 270 1440 5775 7515 sane_start()\001
-4 0 -1 0 0 17 18 0.0000 4 210 2670 7275 7515 if more frames desired\001
--6
-2 2 0 1 -1 7 10 0 19 0.000 0 0 -1 0 0 5
-	 2700 600 10200 600 10200 9600 2700 9600 2700 600
-2 2 0 1 -1 7 8 0 18 0.000 0 0 -1 0 0 5
-	 3300 2400 10200 2400 10200 8925 3300 8925 3300 2400
-2 2 0 1 -1 7 8 0 17 0.000 0 0 -1 0 0 5
-	 3900 2925 10200 2925 10200 4650 3900 4650 3900 2925
-2 2 0 1 -1 7 8 0 17 0.000 0 0 -1 0 0 5
-	 3900 4800 10200 4800 10200 8250 3900 8250 3900 4800
-2 1 0 1 -1 7 8 0 -1 0.000 0 0 -1 0 0 4
-	 10350 3000 10425 3075 10425 4500 10350 4575
-2 1 0 1 -1 7 8 0 -1 0.000 0 0 -1 0 0 4
-	 10350 4875 10425 4950 10425 8100 10350 8175
-4 0 -1 0 0 17 18 0.0000 4 150 735 4200 3300 - use:\001
-4 0 -1 0 0 16 18 0.0000 4 270 1680 4200 5100 - sane_start()\001
-4 0 -1 0 0 17 18 0.0000 4 270 4950 4500 4500 repeatedly to configure device as desired\001
-4 0 -1 0 0 16 18 0.0000 4 270 2715 5400 4080 sane_control_option()\001
-4 0 -1 0 0 16 18 0.0000 4 270 3660 5400 3600 sane_get_option_descriptor()\001
-4 0 -1 0 0 17 18 0.0000 4 150 735 4200 5700 - use:\001
-4 0 -1 0 0 17 18 0.0000 4 270 4080 4500 6900 repeatedly until read returns EOF\001
-4 0 -1 0 0 16 18 0.0000 4 270 2805 5400 6000 sane_get_parameters()\001
-4 0 -1 0 0 16 18 0.0000 4 270 1440 5400 6450 sane_read()\001
-4 0 -1 0 0 16 18 0.0000 4 270 1935 4200 8100 - sane_cancel()\001
-4 0 -1 0 0 16 18 0.0000 4 270 1500 3000 1200 - sane_init()\001
-4 0 -1 0 0 16 18 0.0000 4 270 1590 3000 9300 - sane_exit()\001
-4 0 -1 0 0 17 18 0.0000 4 270 4845 3600 1800 - pick desired device, possibly by using\001
-4 0 -1 0 0 16 18 0.0000 4 270 1770 3600 2700 - sane_open()\001
-4 0 -1 0 0 16 18 0.0000 4 270 1800 3600 8700 - sane_close()\001
-4 0 -1 0 0 16 18 0.0000 4 270 2415 4800 2175 sane_get_devices()\001
-4 0 -1 8 0 17 18 0.0000 4 270 2070 10575 6600 image acquisition\001
-4 0 -1 8 0 17 18 0.0000 4 270 1500 10575 3825 device setup\001
diff --git a/doc/figs/hierarchy.fig b/doc/figs/hierarchy.fig
deleted file mode 100644
index 5545b8d..0000000
--- a/doc/figs/hierarchy.fig
+++ /dev/null
@@ -1,79 +0,0 @@
-#FIG 3.1
-Landscape
-Center
-Inches
-1200 2
-6 10500 4500 12300 5400
-2 2 0 2 -1 7 0 0 -1 0.000 0 0 -1 0 0 5
-	 10650 4785 12150 4785 12150 5385 10650 5385 10650 4785
-4 1 -1 0 0 16 18 0.0000 4 210 660 11399 5182 qcam\001
--6
-6 7200 4500 9000 5400
-2 2 0 2 -1 7 0 0 -1 0.000 0 0 -1 0 0 5
-	 7350 4785 8850 4785 8850 5385 7350 5385 7350 4785
-4 1 -1 0 0 16 18 0.0000 4 270 315 8099 5182 hp\001
--6
-2 2 0 2 -1 7 0 0 -1 0.000 0 0 -1 0 0 5
-	 2250 1185 3750 1185 3750 1785 2250 1785 2250 1185
-2 2 0 2 -1 7 0 0 -1 0.000 0 0 -1 0 0 5
-	 450 2985 1950 2985 1950 3585 450 3585 450 2985
-2 2 0 2 -1 7 0 0 -1 0.000 0 0 -1 0 0 5
-	 2250 2985 3750 2985 3750 3585 2250 3585 2250 2985
-2 2 0 2 -1 7 0 0 -1 0.000 0 0 -1 0 0 5
-	 4050 2985 5550 2985 5550 3585 4050 3585 4050 2985
-2 2 0 2 -1 7 0 0 -1 0.000 0 0 -1 0 0 5
-	 8850 1185 10350 1185 10350 1785 8850 1785 8850 1185
-2 1 0 1 -1 7 0 0 -1 0.000 0 0 -1 0 0 2
-	 2700 1800 1200 3000
-2 1 0 1 -1 7 0 0 -1 0.000 0 0 -1 0 0 2
-	 3000 1800 3000 3000
-2 1 0 1 -1 7 0 0 -1 0.000 0 0 -1 0 0 2
-	 3300 1800 4800 3000
-2 1 0 1 -1 7 0 0 -1 0.000 0 0 -1 0 0 2
-	 9600 1800 9600 2100
-2 1 0 1 -1 7 0 0 -1 0.000 0 0 -1 0 0 2
-	 9450 2700 8100 4800
-2 1 0 1 -1 7 0 0 -1 0.000 0 0 -1 0 0 2
-	 11400 4200 11400 4800
-2 2 0 0 0 0 10 0 2 0.000 0 0 -1 0 0 5
-	 5700 3825 300 3825 300 300 5700 300 5700 3825
-2 2 0 0 0 0 10 0 2 0.000 0 0 -1 0 0 5
-	 12300 5550 7200 5550 7200 300 12300 300 12300 5550
-2 1 0 1 -1 7 0 0 -1 0.000 0 0 -1 0 0 2
-	 1200 3600 1200 4200
-2 1 0 1 -1 7 0 0 -1 0.000 0 0 -1 0 0 2
-	 3000 3600 3000 4125
-2 1 0 1 -1 7 0 0 -1 0.000 0 0 -1 0 0 2
-	 7875 5400 7350 5850
-2 1 0 1 -1 7 0 0 -1 0.000 0 0 -1 0 0 2
-	 8250 5400 8775 5850
-2 1 0 1 -1 7 0 0 -1 0.000 0 0 -1 0 0 2
-	 11475 5400 11475 5850
-2 2 0 2 -1 7 0 0 -1 0.000 0 0 -1 0 0 5
-	 8850 2100 10350 2100 10350 2700 8850 2700 8850 2100
-2 2 0 2 -1 7 0 0 -1 0.000 0 0 -1 0 0 5
-	 10650 3600 12150 3600 12150 4200 10650 4200 10650 3600
-2 1 0 1 -1 7 0 0 -1 0.000 0 0 -1 0 0 2
-	 9750 2700 11400 3600
-3 2 0 1 -1 7 0 0 -1 0.000 0 0 0 7
-	 4800 3600 4275 4500 5025 5475 6150 4575 6525 1350 9450 900
-	 9600 1200
-	 0.00 0.00 4390.23 4024.37 4258.98 4249.38 4300.21 4894.51
-	 4554.60 5418.20 5575.94 5541.53 5962.09 4914.18 6573.46 3810.63
-	 5758.15 2145.68 7223.99 624.74 8573.68 446.85 9524.49 938.52
-	 9561.99 1013.52 0.00 0.00
-4 1 -1 0 0 16 18 0.0000 4 210 525 1199 3382 pnm\001
-4 1 -1 0 0 16 18 0.0000 4 210 870 2999 3382 mustek\001
-4 1 -1 0 0 17 14 0.0000 4 210 855 1200 4425 pnm files\001
-4 1 -1 0 0 17 14 0.0000 4 120 765 3000 4380 scanner\001
-4 1 -1 0 0 17 14 0.0000 4 150 945 7350 6165 scanner 1\001
-4 1 -1 0 0 17 14 0.0000 4 150 945 8925 6165 scanner 2\001
-4 1 -1 0 0 17 14 0.0000 4 165 1290 11475 6135 video camera\001
-4 1 -1 0 0 17 14 0.0000 4 165 1035 3000 600 machine A\001
-4 1 -1 0 0 17 14 0.0000 4 165 1020 9600 630 machine B\001
-4 1 -1 0 0 17 14 0.0000 4 165 1860 4725 5850 network connection\001
-4 1 -1 0 0 16 18 0.0000 4 210 285 2999 1582 dll\001
-4 1 -1 0 0 16 18 0.0000 4 195 390 4799 3382 net\001
-4 1 -1 0 0 16 18 0.0000 4 210 735 9599 1582 saned\001
-4 1 -1 0 0 16 18 0.0000 4 210 285 9599 2482 dll\001
-4 1 -1 0 0 16 18 0.0000 4 210 960 11399 3982 autolum\001
diff --git a/doc/figs/image-data.fig b/doc/figs/image-data.fig
deleted file mode 100644
index d52a90e..0000000
--- a/doc/figs/image-data.fig
+++ /dev/null
@@ -1,63 +0,0 @@
-#FIG 3.1
-Portrait
-Center
-Inches
-1200 2
-6 1725 450 5925 1650
-6 1800 975 3150 1350
-2 2 0 1 -1 7 0 0 -1 0.000 0 0 -1 0 0 5
-	 1800 1200 3150 1200 3150 1350 1800 1350 1800 1200
-4 0 -1 0 0 16 12 0.0000 4 135 1260 1875 1125 7 6 5 4 3 2 1 0\001
--6
-6 3150 975 4500 1350
-2 2 0 1 -1 7 0 0 -1 0.000 0 0 -1 0 0 5
-	 3150 1200 4500 1200 4500 1350 3150 1350 3150 1200
-4 0 -1 0 0 16 12 0.0000 4 135 1260 3225 1125 7 6 5 4 3 2 1 0\001
--6
-6 4500 975 5850 1350
-2 2 0 1 -1 7 0 0 -1 0.000 0 0 -1 0 0 5
-	 4500 1200 5850 1200 5850 1350 4500 1350 4500 1200
-4 0 -1 0 0 16 12 0.0000 4 135 1260 4575 1125 7 6 5 4 3 2 1 0\001
--6
-2 2 0 2 -1 7 0 0 -1 0.000 0 0 -1 0 0 5
-	 1800 1200 5850 1200 5850 1350 1800 1350 1800 1200
-2 1 0 1 -1 7 0 0 -1 0.000 0 0 -1 0 0 7
-	 1800 900 1950 825 3750 825 3825 750 3900 825 5700 825
-	 5850 900
-4 0 -1 0 0 16 12 0.0000 4 105 60 2475 1575 r\001
-4 1 -1 0 0 16 12 0.0000 4 150 105 3825 1575 g\001
-4 1 -1 0 0 16 12 0.0000 4 135 105 5175 1575 b\001
-4 1 -1 0 0 16 12 0.0000 4 180 555 3825 600 pixel 0\001
--6
-6 5850 975 7200 1350
-2 2 0 1 -1 7 0 0 -1 0.000 0 0 -1 0 0 5
-	 5850 1200 7200 1200 7200 1350 5850 1350 5850 1200
-4 0 -1 0 0 16 12 0.0000 4 135 1260 5925 1125 7 6 5 4 3 2 1 0\001
--6
-6 7200 975 8550 1350
-2 2 0 1 -1 7 0 0 -1 0.000 0 0 -1 0 0 5
-	 7200 1200 8550 1200 8550 1350 7200 1350 7200 1200
-4 0 -1 0 0 16 12 0.0000 4 135 1260 7275 1125 7 6 5 4 3 2 1 0\001
--6
-6 8550 975 9900 1350
-2 2 0 1 -1 7 0 0 -1 0.000 0 0 -1 0 0 5
-	 8550 1200 9900 1200 9900 1350 8550 1350 8550 1200
-4 0 -1 0 0 16 12 0.0000 4 135 1260 8625 1125 7 6 5 4 3 2 1 0\001
--6
-2 2 0 2 -1 7 0 0 -1 0.000 0 0 -1 0 0 5
-	 5850 1200 9900 1200 9900 1350 5850 1350 5850 1200
-2 1 0 1 -1 7 0 0 -1 0.000 0 0 -1 0 0 7
-	 5850 900 6000 825 7800 825 7875 750 7950 825 9750 825
-	 9900 900
-4 0 -1 0 0 16 12 0.0000 4 105 60 6525 1575 r\001
-4 1 -1 0 0 16 12 0.0000 4 150 105 7875 1575 g\001
-4 1 -1 0 0 16 12 0.0000 4 135 105 9225 1575 b\001
-4 1 -1 0 0 16 12 0.0000 4 180 555 7875 600 pixel 1\001
-4 1 -1 0 0 16 12 0.0000 4 180 525 9225 1950 byte 5\001
-4 1 -1 0 0 16 12 0.0000 4 180 525 7875 1950 byte 4\001
-4 1 -1 0 0 16 12 0.0000 4 180 525 6525 1950 byte 3\001
-4 1 -1 0 0 16 12 0.0000 4 180 525 5175 1950 byte 2\001
-4 1 -1 0 0 16 12 0.0000 4 180 465 3825 1950 byte1\001
-4 1 -1 0 0 16 12 0.0000 4 180 465 2475 1950 byte0\001
-4 1 -1 0 0 16 12 0.0000 4 15 180 10050 1275 ....\001
-4 2 -1 0 0 16 12 0.0000 4 135 240 1725 1125 bit:\001
diff --git a/doc/figs/xfer.fig b/doc/figs/xfer.fig
deleted file mode 100644
index c4d8921..0000000
--- a/doc/figs/xfer.fig
+++ /dev/null
@@ -1,32 +0,0 @@
-#FIG 3.1
-Portrait
-Center
-Inches
-1200 2
-6 2325 3150 8175 3750
-2 1 0 2 -1 7 0 0 -1 0.000 0 0 -1 1 0 2
-	2 1 2.00 120.00 240.00
-	 2400 3300 8100 3300
-2 1 0 1 -1 7 0 0 -1 0.000 0 0 -1 1 0 2
-	2 1 2.00 120.00 240.00
-	 8100 3375 2400 3675
--6
-6 2325 3600 8175 4200
-2 1 0 2 -1 7 0 0 -1 0.000 0 0 -1 1 0 2
-	2 1 2.00 120.00 240.00
-	 2400 3750 8100 3750
-2 1 0 1 -1 7 0 0 -1 0.000 0 0 -1 1 0 2
-	2 1 2.00 120.00 240.00
-	 8100 3825 2400 4125
--6
-2 2 0 1 -1 7 0 0 -1 0.000 0 0 -1 0 0 5
-	 2250 3150 8250 3150 8250 6150 2250 6150 2250 3150
-2 1 0 2 -1 7 0 0 -1 0.000 0 0 -1 1 0 2
-	2 1 2.00 120.00 240.00
-	 2400 4200 8100 4200
-2 1 0 1 -1 7 0 0 -1 0.000 0 0 -1 1 0 2
-	2 1 2.00 120.00 240.00
-	 8100 4275 2400 4575
-2 1 0 2 -1 7 0 0 -1 0.000 0 0 -1 1 0 2
-	2 1 2.00 120.00 240.00
-	 2400 4650 8100 4650