diff options
| author | Hashcode <hashcode0f@gmail.com> | 2015-02-03 14:11:21 -0800 |
|---|---|---|
| committer | Hashcode <hashcode0f@gmail.com> | 2015-02-03 14:11:21 -0800 |
| commit | d4ca65e3c2ce14acdfa848cc527c4ddcc4d4453c (patch) | |
| tree | bd514f7db2981c8f3cf5db07e099fdcb7400bfe0 /camera/inc | |
| parent | c980a343b9343671104c3e169c24c2f570c0b3bd (diff) | |
| download | hardware_ti_omap4-d4ca65e3c2ce14acdfa848cc527c4ddcc4d4453c.zip hardware_ti_omap4-d4ca65e3c2ce14acdfa848cc527c4ddcc4d4453c.tar.gz hardware_ti_omap4-d4ca65e3c2ce14acdfa848cc527c4ddcc4d4453c.tar.bz2 | |
camera: clean up build for when OMAP_ENHANCEMENT_CPCAM is not defined
Diffstat (limited to 'camera/inc')
| -rw-r--r-- | camera/inc/CameraHal.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/camera/inc/CameraHal.h b/camera/inc/CameraHal.h index 4a21a67..805be06 100644 --- a/camera/inc/CameraHal.h +++ b/camera/inc/CameraHal.h @@ -1022,7 +1022,7 @@ class DisplayAdapter : public BufferProvider, public virtual android::RefBase public: DisplayAdapter(); -#ifdef OMAP_ENHANCEMENT +#ifdef OMAP_ENHANCEMENT_CPCAM preview_stream_extended_ops_t * extendedOps() const { return mExtendedOps; } @@ -1060,7 +1060,7 @@ public: virtual bool match(const char * str) { return false; } private: -#ifdef OMAP_ENHANCEMENT +#ifdef OMAP_ENHANCEMENT_CPCAM preview_stream_extended_ops_t * mExtendedOps; #endif }; @@ -1428,7 +1428,7 @@ public: android::sp<DisplayAdapter> mBufferSourceAdapter_In; android::sp<DisplayAdapter> mBufferSourceAdapter_Out; -#ifdef OMAP_ENHANCEMENT +#ifdef OMAP_ENHANCEMENT_CPCAM preview_stream_extended_ops_t * mExtendedPreviewStreamOps; #endif |