From f998f57b85b1a6eda8ea1c4b511199eb2d122a9f Mon Sep 17 00:00:00 2001 From: Daniel Levin Date: Thu, 31 May 2012 11:22:16 +0300 Subject: CameraHAL: Portability changes 1. Moved common definitions to Global.h header: - CAMHAL_LOG* macros (also added CAMHAL_LOGI and CAMHAL_LOGW) - CAMHAL_ASSERT* macros - CAMHAL_UNUSED macro 2. Renamed NV12_resize.c to NV12_resize.cpp 3. Added common math functions into UtilsGlobal.h header: - min(a, b) - returns min of a and b - max(a, b) - returns max of a and b - bound(min, a, max) - return nearest value to a in scope [min..max] - floor(a) - round a to lower integer - round(a) - round a to nearest integer 4. Portability: - Fixed LOG* macros to use appropriate CAMHAL_LOG* wrappers. - Reworked the Android.mk to include proper directories depending on current pastry. Change-Id: I6fbd1ee02d8af2195b91cc357ddcf554fe77f495 Signed-off-by: Daniel Levin --- camera/inc/CameraProperties.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'camera/inc/CameraProperties.h') diff --git a/camera/inc/CameraProperties.h b/camera/inc/CameraProperties.h index dcfc2c7..4763b10 100644 --- a/camera/inc/CameraProperties.h +++ b/camera/inc/CameraProperties.h @@ -30,6 +30,8 @@ #include #include "cutils/properties.h" +#include "Common.h" + namespace android { #define MAX_CAMERAS_SUPPORTED 3 -- cgit v1.1