Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2cd5e9ae authored by codeworkx's avatar codeworkx
Browse files

camera: fix samsung/qcom conflict 

hello ifdef hell

Change-Id: I76bede141dfd4fd4f32b5a5aa8987fb255c207a5
parent c3727864

include/camera/CameraParameters.h

+4 −2
Original line number Diff line number Diff line
@@ -580,8 +580,6 @@ public: 
    static const char KEY_FULL_VIDEO_SNAP_SUPPORTED[];



#ifdef QCOM_HARDWARE

    static const char KEY_ISO_MODE[];

    static const char KEY_SUPPORTED_ISO_MODES[];

    static const char KEY_LENSSHADE[] ;

    static const char KEY_SUPPORTED_LENSSHADE_MODES[] ;
@@ -593,6 +591,10 @@ public: 
    static const char KEY_GPS_ALTITUDE_REF[];

    static const char KEY_GPS_STATUS[];

    static const char KEY_EXIF_DATETIME[];

#ifndef SAMSUNG_CAMERA_HARDWARE

    static const char KEY_ISO_MODE[];

    static const char KEY_SUPPORTED_ISO_MODES[];

#endif

#endif



    // The state of the video stabilization. If set to true, both the

libs/camera/CameraParameters.cpp

+4 −2
Original line number Diff line number Diff line
@@ -119,8 +119,6 @@ const char CameraParameters::KEY_SMOOTH_ZOOM_SUPPORTED[] = "smooth-zoom-supporte 
const char CameraParameters::KEY_FOCUS_DISTANCES[] = "focus-distances";

const char CameraParameters::KEY_VIDEO_FRAME_FORMAT[] = "video-frame-format";

#ifdef QCOM_HARDWARE

const char CameraParameters::KEY_ISO_MODE[] = "iso";

const char CameraParameters::KEY_SUPPORTED_ISO_MODES[] = "iso-values";

const char CameraParameters::KEY_LENSSHADE[] = "lensshade";

const char CameraParameters::KEY_SUPPORTED_LENSSHADE_MODES[] = "lensshade-values";

const char CameraParameters::KEY_AUTO_EXPOSURE[] = "auto-exposure";
@@ -139,6 +137,10 @@ const char CameraParameters::KEY_REDEYE_REDUCTION[] = "redeye-reduction"; 
const char CameraParameters::KEY_SUPPORTED_REDEYE_REDUCTION[] = "redeye-reduction-values";

const char CameraParameters::KEY_HIGH_DYNAMIC_RANGE_IMAGING[] = "hdr";

const char CameraParameters::KEY_SUPPORTED_HDR_IMAGING_MODES[] = "hdr-values";

#ifndef SAMSUNG_CAMERA_HARDWARE

const char CameraParameters::KEY_ISO_MODE[] = "iso";

const char CameraParameters::KEY_SUPPORTED_ISO_MODES[] = "iso-values";

#endif

#endif

#ifdef SAMSUNG_CAMERA_HARDWARE

const char CameraParameters::KEY_METERING[] = "metering";