summaryrefslogtreecommitdiffstats
path: root/camera/CameraParameters.cpp
diff options
context:
space:
mode:
authorDaniel Levin <dendy@ti.com>2012-05-31 11:22:16 +0300
committerDaniel Levin <dendy@ti.com>2012-07-25 08:56:45 -0500
commitf998f57b85b1a6eda8ea1c4b511199eb2d122a9f (patch)
tree9079a0baa12bb29b2b3d260ad00ac3810f869dd9 /camera/CameraParameters.cpp
parentbf05c17fc0d1daf5129781373e34e9d67bf02f2e (diff)
downloadhardware_ti_omap4-f998f57b85b1a6eda8ea1c4b511199eb2d122a9f.zip
hardware_ti_omap4-f998f57b85b1a6eda8ea1c4b511199eb2d122a9f.tar.gz
hardware_ti_omap4-f998f57b85b1a6eda8ea1c4b511199eb2d122a9f.tar.bz2
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 <dendy@ti.com>
Diffstat (limited to 'camera/CameraParameters.cpp')
-rw-r--r--camera/CameraParameters.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/camera/CameraParameters.cpp b/camera/CameraParameters.cpp
index f9a444b..a809115 100644
--- a/camera/CameraParameters.cpp
+++ b/camera/CameraParameters.cpp
@@ -21,7 +21,6 @@
*
*/
-#include "CameraHal.h"
#include "CameraProperties.h"
namespace android {