summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorelektroschmock <elektroschmock78@googlemail.com>2019-05-20 07:54:58 +0200
committerElektroschmock <elektroschmock78@googlemail.com>2019-05-20 19:01:51 +0200
commite0d74728a460faf3ef9b77c74fec8d2a9537c2cd (patch)
tree7b53447c52462ce3a37212c980c14fc997d41b1c
parentc23855393c295005f2dd87a2b4b6a78aaf2dcdac (diff)
shamu: camera: Fix some build warnings
* Remove unused parameters Change-Id: I77bd30918d888f160f36b7f4012a7930e5c97dad
-rw-r--r--camera/QCamera2/Android.mk3
-rw-r--r--camera/QCamera2/HAL/QCameraParameters.cpp6
-rw-r--r--camera/QCamera2/HAL/QCameraParameters.h2
3 files changed, 2 insertions, 9 deletions
diff --git a/camera/QCamera2/Android.mk b/camera/QCamera2/Android.mk
index d8c0d2c4..ff5a3870 100644
--- a/camera/QCamera2/Android.mk
+++ b/camera/QCamera2/Android.mk
@@ -2,12 +2,9 @@ LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
-# QCameraParameters.h has unused private field.
# QCamera3PostProc.cpp has unused label.
# QCamera3Channel.cpp compares array to null pointer.
LOCAL_CLANG_CFLAGS += \
- -Wno-error=unused-private-field \
- -Wno-error=unused-label \
-Wno-error=tautological-pointer-compare
LOCAL_SRC_FILES := \
diff --git a/camera/QCamera2/HAL/QCameraParameters.cpp b/camera/QCamera2/HAL/QCameraParameters.cpp
index 1fa37622..b56727ca 100644
--- a/camera/QCamera2/HAL/QCameraParameters.cpp
+++ b/camera/QCamera2/HAL/QCameraParameters.cpp
@@ -8579,11 +8579,9 @@ int32_t QCameraParameters::commitParamChanges()
*
* RETURN : none
*==========================================================================*/
-QCameraReprocScaleParam::QCameraReprocScaleParam(QCameraParameters *parent)
- : mParent(parent),
- mScaleEnabled(false),
+QCameraReprocScaleParam::QCameraReprocScaleParam(QCameraParameters *parent __unused)
+ : mScaleEnabled(false),
mIsUnderScaling(false),
- mScaleDirection(0),
mNeedScaleCnt(0),
mSensorSizeTblCnt(0),
mSensorSizeTbl(NULL),
diff --git a/camera/QCamera2/HAL/QCameraParameters.h b/camera/QCamera2/HAL/QCameraParameters.h
index 8a6df5c7..a38afcc9 100644
--- a/camera/QCamera2/HAL/QCameraParameters.h
+++ b/camera/QCamera2/HAL/QCameraParameters.h
@@ -86,10 +86,8 @@ private:
int32_t setSensorSupportedPicSize();
uint8_t checkScaleSizeTable(uint8_t scale_cnt, cam_dimension_t *scale_tbl, uint8_t org_cnt, cam_dimension_t *org_tbl);
- QCameraParameters *mParent;
bool mScaleEnabled;
bool mIsUnderScaling; //if in scale status
- bool mScaleDirection; // 0: Upscaling; 1: Downscaling
// picture size cnt that need scale operation
uint8_t mNeedScaleCnt;