diff options
| author | Matthias Vogelgesang <matthias.vogelgesang@ipe.fzk.de> | 2011-03-09 10:56:35 +0100 |
|---|---|---|
| committer | Matthias Vogelgesang <matthias.vogelgesang@ipe.fzk.de> | 2011-03-09 10:56:35 +0100 |
| commit | cc74561cfaff3a4c8719b6972d4ec5c21be535ea (patch) | |
| tree | 3885d477205057be902fbc6acc43d072f349c527 | |
| parent | 876c0214e6f341d071929026a08e1b127e8a0b7f (diff) | |
| download | uca-cc74561cfaff3a4c8719b6972d4ec5c21be535ea.tar.gz uca-cc74561cfaff3a4c8719b6972d4ec5c21be535ea.tar.bz2 uca-cc74561cfaff3a4c8719b6972d4ec5c21be535ea.tar.xz uca-cc74561cfaff3a4c8719b6972d4ec5c21be535ea.zip | |
Fix photon focus capture
| -rw-r--r-- | src/cameras/pf.c | 4 | ||||
| -rw-r--r-- | test/control.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/cameras/pf.c b/src/cameras/pf.c index bd9cd49..65b7b6c 100644 --- a/src/cameras/pf.c +++ b/src/cameras/pf.c @@ -169,7 +169,7 @@ static uint32_t uca_pf_get_property(struct uca_camera_t *cam, enum uca_property_ /* Handle all special cases */ switch (property) { case UCA_PROP_BITDEPTH: - set_void(data, uint8_t, 8); + set_void(data, uint32_t, 8); break; default: @@ -219,7 +219,7 @@ uint32_t uca_pf_init(struct uca_camera_t **cam, struct uca_grabber_t *grabber) struct uca_camera_t *uca = (struct uca_camera_t *) malloc(sizeof(struct uca_camera_t)); uca->grabber = grabber; - uca->grabber->asynchronous = false; + uca->grabber->asynchronous = true; /* Camera found, set function pointers... */ uca->destroy = &uca_pf_destroy; diff --git a/test/control.c b/test/control.c index 3223991..010d6bc 100644 --- a/test/control.c +++ b/test/control.c @@ -278,10 +278,10 @@ int main(int argc, char *argv[]) return 1; } - int width = 640, height = 480, bits_per_sample; + int width, height, bits_per_sample; struct uca_camera_t *cam = uca->cameras; - cam->set_property(cam, UCA_PROP_WIDTH, &width); - cam->set_property(cam, UCA_PROP_HEIGHT, &height); + cam->get_property(cam, UCA_PROP_WIDTH, &width); + cam->get_property(cam, UCA_PROP_HEIGHT, &height); cam->get_property(cam, UCA_PROP_BITDEPTH, &bits_per_sample); g_thread_init(NULL); |