From 5412f817f86b66062e6e2567faa88948bb661652 Mon Sep 17 00:00:00 2001 From: Matthias Vogelgesang Date: Fri, 3 Feb 2012 11:29:28 +0100 Subject: Fix compilation warnings and errors --- src/cameras/simple.h | 4 ++-- src/uca.c | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/cameras/simple.h b/src/cameras/simple.h index 0c8e9a7..6d8e45e 100644 --- a/src/cameras/simple.h +++ b/src/cameras/simple.h @@ -15,8 +15,8 @@ with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA */ -#ifndef __UNIFIED_CAMERA_ACCESS_PHOTON_H -#define __UNIFIED_CAMERA_ACCESS_PHOTON_H +#ifndef __UNIFIED_CAMERA_ACCESS_SIMPLE_H +#define __UNIFIED_CAMERA_ACCESS_SIMPLE_H uint32_t uca_simple_init(struct uca_camera_priv **uca, struct uca_grabber_priv *grabber); diff --git a/src/uca.c b/src/uca.c index 1d07ea4..3b2a84c 100644 --- a/src/uca.c +++ b/src/uca.c @@ -346,6 +346,7 @@ uint32_t uca_cam_release_buffer(struct uca_camera *cam, void *buffer) struct uca_camera_priv *priv = cam->priv; if (priv->release_buffer != NULL) return priv->release_buffer(priv, buffer); + return UCA_ERR_NOT_IMPLEMENTED; } uint32_t uca_cam_grab(struct uca_camera *cam, char *buffer, void *meta_data) -- cgit v1.2.3