diff options
| author | rogersb11 <brettrogers11@gmail.com> | 2015-10-12 22:03:21 -0400 |
|---|---|---|
| committer | Ethan Chen <intervigil@gmail.com> | 2015-11-09 14:07:55 -0800 |
| commit | dbf394e8477a258df05fcf76feb267888931e18a (patch) | |
| tree | 1b8904e46a01c4e3595a99832f259d6509ca569b | |
| parent | 822b70bd53178d75372902b643256a0f05767d0e (diff) | |
| download | android_hardware_samsung-dbf394e8477a258df05fcf76feb267888931e18a.tar.gz android_hardware_samsung-dbf394e8477a258df05fcf76feb267888931e18a.tar.bz2 android_hardware_samsung-dbf394e8477a258df05fcf76feb267888931e18a.zip | |
samsung: Compilation fixes
* Add missing headers
* Cast values to correct types
Change-Id: Iaf621c562e884daeb22f6ec700d6989ba6ba1aef
| -rw-r--r-- | exynos/multimedia/openmax/osal/SEC_OSAL_Android.cpp | 2 | ||||
| -rw-r--r-- | exynos/multimedia/utils/csc/exynos4/csc_fimc.cpp | 1 | ||||
| -rw-r--r-- | exynos3/s5pc110/libs3cjpeg/JpegEncoder.cpp | 1 | ||||
| -rw-r--r-- | exynos4/hal/libcamera/SecCameraHWInterface.cpp | 22 |
4 files changed, 14 insertions, 12 deletions
diff --git a/exynos/multimedia/openmax/osal/SEC_OSAL_Android.cpp b/exynos/multimedia/openmax/osal/SEC_OSAL_Android.cpp index 1f0231a..40cfd2b 100644 --- a/exynos/multimedia/openmax/osal/SEC_OSAL_Android.cpp +++ b/exynos/multimedia/openmax/osal/SEC_OSAL_Android.cpp @@ -134,7 +134,7 @@ OMX_ERRORTYPE SEC_OSAL_LockANBHandle( OMX_ERRORTYPE ret = OMX_ErrorNone; GraphicBufferMapper &mapper = GraphicBufferMapper::get(); buffer_handle_t bufferHandle = (buffer_handle_t) handle; - Rect bounds(width, height); + Rect bounds((uint32_t)width, (uint32_t)height); SEC_OSAL_Log(SEC_LOG_TRACE, "%s: handle: 0x%x", __func__, handle); diff --git a/exynos/multimedia/utils/csc/exynos4/csc_fimc.cpp b/exynos/multimedia/utils/csc/exynos4/csc_fimc.cpp index a8e6b67..18ecebf 100644 --- a/exynos/multimedia/utils/csc/exynos4/csc_fimc.cpp +++ b/exynos/multimedia/utils/csc/exynos4/csc_fimc.cpp @@ -28,6 +28,7 @@ */ #include <utils/Log.h> +#include <errno.h> #include <dlfcn.h> #include "SEC_OMX_Def.h" diff --git a/exynos3/s5pc110/libs3cjpeg/JpegEncoder.cpp b/exynos3/s5pc110/libs3cjpeg/JpegEncoder.cpp index 96cee3d..d6d779a 100644 --- a/exynos3/s5pc110/libs3cjpeg/JpegEncoder.cpp +++ b/exynos3/s5pc110/libs3cjpeg/JpegEncoder.cpp @@ -26,6 +26,7 @@ #include <utils/Log.h> #include <sys/mman.h> #include <fcntl.h> +#include <string.h> #include "JpegEncoder.h" diff --git a/exynos4/hal/libcamera/SecCameraHWInterface.cpp b/exynos4/hal/libcamera/SecCameraHWInterface.cpp index b7077eb..a30c989 100644 --- a/exynos4/hal/libcamera/SecCameraHWInterface.cpp +++ b/exynos4/hal/libcamera/SecCameraHWInterface.cpp @@ -3388,22 +3388,22 @@ done: } static hw_module_methods_t camera_module_methods = { - open : HAL_camera_device_open + .open = HAL_camera_device_open }; extern "C" { struct camera_module HAL_MODULE_INFO_SYM = { - common : { - tag : HARDWARE_MODULE_TAG, - version_major : 1, - version_minor : 0, - id : CAMERA_HARDWARE_MODULE_ID, - name : "orion camera HAL", - author : "Samsung Corporation", - methods : &camera_module_methods, + .common = { + .tag = HARDWARE_MODULE_TAG, + .version_major = 1, + .version_minor = 0, + .id = CAMERA_HARDWARE_MODULE_ID, + .name = "orion camera HAL", + .author = "Samsung Corporation", + .methods = &camera_module_methods, }, - get_number_of_cameras : HAL_getNumberOfCameras, - get_camera_info : HAL_getCameraInfo + .get_number_of_cameras = HAL_getNumberOfCameras, + .get_camera_info = HAL_getCameraInfo }; } |