Warning fix. ifdefs for 4.1.1 added.

13 years ago · 7eb9fa14d3
parent 6bb509b44a
commit 7eb9fa14d3
1 changed files with 5 additions and 1 deletions
--- a/modules/androidcamera/camera_wrapper/camera_wrapper.cpp
+++ b/modules/androidcamera/camera_wrapper/camera_wrapper.cpp
@ -58,6 +58,9 @@

 using namespace android;

+void debugShowFPS();
+
+#if defined(ANDROID_r4_1_1)
 class ConsumerListenerStub: public BufferQueue::ConsumerListener
 {
 public:
@ -68,6 +71,7 @@ public:
    {
    }
 };
+#endif

 void debugShowFPS()
 {
@ -277,7 +281,7 @@ public:

    virtual void postData(int32_t msgType, const sp<IMemory>& dataPtr
 #if defined(ANDROID_r4_0_0) || defined(ANDROID_r4_0_3) || defined(ANDROID_r4_1_1)
-                          ,camera_frame_metadata_t* metadata
+                          ,camera_frame_metadata_t*
 #endif
                          )
    {