diff options
| author | Matthias Vogelgesang <matthias.vogelgesang@ipe.fzk.de> | 2011-03-18 11:10:00 +0100 |
|---|---|---|
| committer | Matthias Vogelgesang <matthias.vogelgesang@ipe.fzk.de> | 2011-03-18 11:10:00 +0100 |
| commit | ef5dfb7febd8881158e493451a27a2500ced14cb (patch) | |
| tree | 142d3fce467aa076a4f38437058a5e93f1fecdb7 /src/cameras/dummy.c | |
| parent | 750080d576dadb9c29ac5f565b8e16c8b9aa4a7d (diff) | |
| download | uca-ef5dfb7febd8881158e493451a27a2500ced14cb.tar.gz uca-ef5dfb7febd8881158e493451a27a2500ced14cb.tar.bz2 uca-ef5dfb7febd8881158e493451a27a2500ced14cb.tar.xz uca-ef5dfb7febd8881158e493451a27a2500ced14cb.zip | |
Initialize all camera fields with NULL to catch errors early on
Diffstat (limited to 'src/cameras/dummy.c')
| -rw-r--r-- | src/cameras/dummy.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/cameras/dummy.c b/src/cameras/dummy.c index 2ad2ec9..0d6c9d1 100644 --- a/src/cameras/dummy.c +++ b/src/cameras/dummy.c @@ -283,7 +283,7 @@ static uint32_t uca_dummy_destroy(struct uca_camera *cam) uint32_t uca_dummy_init(struct uca_camera **cam, struct uca_grabber *grabber) { - struct uca_camera *uca = (struct uca_camera *) malloc(sizeof(struct uca_camera)); + struct uca_camera *uca = uca_cam_new(); uca->destroy = &uca_dummy_destroy; uca->set_property = &uca_dummy_set_property; @@ -296,10 +296,6 @@ uint32_t uca_dummy_init(struct uca_camera **cam, struct uca_grabber *grabber) uca->state = UCA_CAM_CONFIGURABLE; uca->frame_width = 320; uca->frame_height = 240; - uca->current_frame = 0; - uca->grabber = NULL; - uca->callback = NULL; - uca->callback_user = NULL; struct dummy_cam *dummy_cam = (struct dummy_cam *) malloc(sizeof(struct dummy_cam)); dummy_cam->bitdepth = 8; |