Skip to content

O
opencv
Commit 7eb9fa14 authored by Alexander Smorkalov's avatar Alexander Smorkalov Committed by Andrey Kamaev
Browse files
Options

Warning fix. ifdefs for 4.1.1 added.

parent 6bb509b4
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 1 deletion
modules/androidcamera/camera_wrapper/camera_wrapper.cpp
View file @ 7eb9fa14
...@@ -58,6 +58,9 @@ ...@@ -58,6 +58,9 @@
using namespace android; using namespace android;
void debugShowFPS();
#if defined(ANDROID_r4_1_1)
class ConsumerListenerStub: public BufferQueue::ConsumerListener class ConsumerListenerStub: public BufferQueue::ConsumerListener
{ {
public: public:
...@@ -68,6 +71,7 @@ public: ...@@ -68,6 +71,7 @@ public:
{ {
} }
}; };
#endif
void debugShowFPS() void debugShowFPS()
{ {
...@@ -277,7 +281,7 @@ public: ...@@ -277,7 +281,7 @@ public:
virtual void postData(int32_t msgType, const sp<IMemory>& dataPtr 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) #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 #endif
) )
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment