From f498fcd1eac49b2d5cee6285d6e16e0cd1498f7c Mon Sep 17 00:00:00 2001
From: Daniel Drake <dsd@cs.manchester.ac.uk>
Date: Sun, 4 Nov 2007 19:10:23 +0000
Subject: [PATCH] Fix img_capture_continuous build

Also enable it in the default development build
---
 autogen.sh                        |  2 +-
 examples/img_capture_continuous.c | 13 +++++--------
 libfprint/drivers/uru4000.c       |  2 +-
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index 7d368f8..5499285 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -5,4 +5,4 @@ autoheader || exit 1
 autoconf || exit 1
 automake -a -c || exit 1
 ./configure --enable-maintainer-mode --enable-examples-build \
-	--enable-debug-log $*
+	--enable-x11-examples-build --enable-debug-log $*
diff --git a/examples/img_capture_continuous.c b/examples/img_capture_continuous.c
index ca67b33..b00bb14 100644
--- a/examples/img_capture_continuous.c
+++ b/examples/img_capture_continuous.c
@@ -140,7 +140,6 @@ int main(void)
 	struct fp_dscv_dev *ddev;
 	struct fp_dscv_dev **discovered_devs;
 	struct fp_dev *dev;
-	struct fp_img_dev *imgdev;
 	int img_width;
 	int img_height;
 	int standardize = 0;
@@ -170,15 +169,13 @@ int main(void)
 		exit(1);
 	}
 
-	imgdev = fp_dev_to_img_dev(dev);
-	if (!imgdev) {
-		fprintf(stderr, "could not get image dev, is this an imaging "
-			"device?\n");
+	if (!fp_dev_supports_imaging(dev)) {
+		fprintf(stderr, "this device does not have imaging capabilities.\n");
 		goto out;
 	}
 
-	img_width = fp_imgdev_get_img_width(imgdev);
-	img_height = fp_imgdev_get_img_height(imgdev);
+	img_width = fp_dev_get_img_width(dev);
+	img_height = fp_dev_get_img_height(dev);
 	framebuffer = malloc(img_width * img_height * 2);
 	if (!framebuffer)
 		goto out;
@@ -211,7 +208,7 @@ int main(void)
 	while (1) { /* event loop */
 		struct fp_img *img;
 
-		r = fp_imgdev_capture(imgdev, 1, &img);
+		r = fp_dev_img_capture(dev, 1, &img);
 		if (r) {
 			fprintf(stderr, "image capture failed, code %d\n", r);
 			goto out;
diff --git a/libfprint/drivers/uru4000.c b/libfprint/drivers/uru4000.c
index 8bdb27c..e91e16b 100644
--- a/libfprint/drivers/uru4000.c
+++ b/libfprint/drivers/uru4000.c
@@ -440,7 +440,7 @@ retry:
 		return -EIO;
 	}
 
-	r = get_irq_with_type(dev, IRQDATA_SCANPWR_ON, 400);
+	r = get_irq_with_type(dev, IRQDATA_SCANPWR_ON, 300);
 	if (r == GET_IRQ_OVERFLOW) {
 		goto retry;
 	} else if (r == -ETIMEDOUT) {