tequilaOS/platform_hardware_libhardware
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "modules/camera: Fix compiler warnings" am: f7888e1130

Browse source 
am: f832261e65

Change-Id: Iab1dadfb9626ba2c79641623c1a2dd834a914a7d
This commit is contained in:
Greg Kaiser 2016-08-31 22:07:21 +00:00 committed by android-build-merger
commit d6cebded75
3 changed files with 29 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
modules/camera/CameraHAL.cpp
View file

@ -165,29 +165,29 @@ static int open_dev(const hw_module_t* mod, const char* name, hw_device_t** dev)
}
static hw_module_methods_t gCameraModuleMethods = {
open : open_dev
.open = open_dev
};
camera_module_t HAL_MODULE_INFO_SYM __attribute__ ((visibility("default"))) = {
common : {
tag : HARDWARE_MODULE_TAG,
module_api_version : CAMERA_MODULE_API_VERSION_2_2,
hal_api_version : HARDWARE_HAL_API_VERSION,
id : CAMERA_HARDWARE_MODULE_ID,
name : "Default Camera HAL",
author : "The Android Open Source Project",
methods : &gCameraModuleMethods,
dso : NULL,
reserved : {0},
.common = {
.tag = HARDWARE_MODULE_TAG,
.module_api_version = CAMERA_MODULE_API_VERSION_2_2,
.hal_api_version = HARDWARE_HAL_API_VERSION,
.id = CAMERA_HARDWARE_MODULE_ID,
.name = "Default Camera HAL",
.author = "The Android Open Source Project",
.methods = &gCameraModuleMethods,
.dso = NULL,
.reserved = {0},
},
get_number_of_cameras : get_number_of_cameras,
get_camera_info : get_camera_info,
set_callbacks : set_callbacks,
get_vendor_tag_ops : get_vendor_tag_ops,
open_legacy : NULL,
set_torch_mode : NULL,
init : NULL,
reserved : {0},
.get_number_of_cameras = get_number_of_cameras,
.get_camera_info = get_camera_info,
.set_callbacks = set_callbacks,
.get_vendor_tag_ops = get_vendor_tag_ops,
.open_legacy = NULL,
.set_torch_mode = NULL,
.init = NULL,
.reserved = {0},
};
} // extern "C"

3
modules/camera/ExampleCamera.cpp
View file

@ -264,7 +264,8 @@ int ExampleCamera::setZslTemplate(Metadata m)
return setTemplate(CAMERA3_TEMPLATE_ZERO_SHUTTER_LAG, m.get());
}
bool ExampleCamera::isValidCaptureSettings(const camera_metadata_t* settings)
bool ExampleCamera::isValidCaptureSettings(
const camera_metadata_t* /*settings*/)
{
// TODO: reject settings that cannot be captured
return true;

13
modules/camera/VendorTags.cpp
View file

@ -136,12 +136,13 @@ VendorTags::~VendorTags()
{
}
int VendorTags::getTagCount(const vendor_tag_ops_t* ops)
int VendorTags::getTagCount(const vendor_tag_ops_t* /*ops*/)
{
return mTagCount;
}
void VendorTags::getAllTags(const vendor_tag_ops_t* ops, uint32_t* tag_array)
void VendorTags::getAllTags(const vendor_tag_ops_t* /*ops*/,
uint32_t* tag_array)
{
if (tag_array == NULL) {
ALOGE("%s: NULL tag_array", __func__);
@ -156,7 +157,8 @@ void VendorTags::getAllTags(const vendor_tag_ops_t* ops, uint32_t* tag_array)
}
}
const char* VendorTags::getSectionName(const vendor_tag_ops_t* ops, uint32_t tag)
const char* VendorTags::getSectionName(const vendor_tag_ops_t* /*ops*/,
uint32_t tag)
{
const Section* section = getSection(tag);
@ -166,7 +168,8 @@ const char* VendorTags::getSectionName(const vendor_tag_ops_t* ops, uint32_t tag
return section->name;
}
const char* VendorTags::getTagName(const vendor_tag_ops_t* ops, uint32_t tag)
const char* VendorTags::getTagName(const vendor_tag_ops_t* /*ops*/,
uint32_t tag)
{
const Entry* entry = getEntry(tag);
@ -176,7 +179,7 @@ const char* VendorTags::getTagName(const vendor_tag_ops_t* ops, uint32_t tag)
return entry->name;
}
int VendorTags::getTagType(const vendor_tag_ops_t* ops, uint32_t tag)
int VendorTags::getTagType(const vendor_tag_ops_t* /*ops*/, uint32_t tag)
{
const Entry* entry = getEntry(tag);