From 9088b328b51e685d424fd21817e8aab456d6ab24 Mon Sep 17 00:00:00 2001
From: Matthias Vogelgesang <matthias.vogelgesang@ipe.fzk.de>
Date: Thu, 10 Mar 2011 17:46:39 +0100
Subject: Fix all warnings issued by -Wall

---
 src/cameras/pco.c | 14 ++------------
 src/cameras/pf.c  |  9 +++------
 2 files changed, 5 insertions(+), 18 deletions(-)

(limited to 'src/cameras')

diff --git a/src/cameras/pco.c b/src/cameras/pco.c
index 565fd62..9ae94c8 100644
--- a/src/cameras/pco.c
+++ b/src/cameras/pco.c
@@ -15,12 +15,6 @@
 #define set_void(p, type, value) { *((type *) p) = (type) value; }
 
 
-static uint32_t uca_pco_set_bitdepth(struct uca_camera_t *cam, uint8_t *bitdepth)
-{
-    /* TODO: it's not possible via CameraLink so do it via frame grabber */
-    return 0;
-}
-
 static uint32_t uca_pco_set_exposure(struct uca_camera_t *cam, uint32_t *exposure)
 {
     uint32_t e, d;
@@ -41,11 +35,6 @@ static uint32_t uca_pco_set_delay(struct uca_camera_t *cam, uint32_t *delay)
     return UCA_NO_ERROR;
 }
 
-static uint32_t uca_pco_acquire_image(struct uca_camera_t *cam, void *buffer)
-{
-    return UCA_NO_ERROR;
-}
-
 static uint32_t uca_pco_destroy(struct uca_camera_t *cam)
 {
     pco_set_rec_state(GET_PCO(cam), 0);
@@ -223,6 +212,7 @@ uint32_t uca_pco_stop_recording(struct uca_camera_t *cam)
 {
     if (pco_set_rec_state(GET_PCO(cam), 0) != PCO_NOERROR)
         return UCA_ERR_PROP_GENERAL;
+    return UCA_NO_ERROR;
 }
 
 uint32_t uca_pco_grab(struct uca_camera_t *cam, char *buffer)
@@ -282,7 +272,7 @@ uint32_t uca_pco_init(struct uca_camera_t **cam, struct uca_grabber_t *grabber)
     val = FREE_RUN;
     grabber->set_property(grabber, FG_TRIGGERMODE, &val);
 
-    int width, height;
+    uint32_t width, height;
     pco_get_actual_size(pco, &width, &height);
     uca->frame_width = width;
     uca->frame_height = height;
diff --git a/src/cameras/pf.c b/src/cameras/pf.c
index a39fd3d..c199576 100644
--- a/src/cameras/pf.c
+++ b/src/cameras/pf.c
@@ -55,11 +55,6 @@ static struct uca_pf_map uca_to_pf[] = {
     { -1, NULL }
 };
 
-static uint32_t uca_pf_acquire_image(struct uca_camera_t *cam, void *buffer)
-{
-    return UCA_NO_ERROR;
-}
-
 static uint32_t uca_pf_set_property(struct uca_camera_t *cam, enum uca_property_ids property, void *data)
 {
     struct uca_grabber_t *grabber = cam->grabber;
@@ -128,7 +123,6 @@ static uint32_t uca_pf_set_property(struct uca_camera_t *cam, enum uca_property_
 
 static uint32_t uca_pf_get_property(struct uca_camera_t *cam, enum uca_property_ids property, void *data)
 {
-    struct uca_grabber_t *grabber = cam->grabber;
     TOKEN t;    /* You gotta love developers who name types capitalized... */
     PFValue value;
 
@@ -160,6 +154,9 @@ static uint32_t uca_pf_get_property(struct uca_camera_t *cam, enum uca_property_
                 case PF_MODE:
                     set_void(data, uint32_t, (uint32_t) value.value.i);
                     break;
+
+                default:
+                    break;
             }
             return UCA_NO_ERROR;
         }
-- 
cgit v1.2.3