generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Warning fix. ifdefs for 4.1.1 added.

Browse Source
This commit is contained in:
Alexander Smorkalov 2012-07-31 12:15:54 +04:00 committed by Andrey Kamaev
parent 6bb509b44a
commit 7eb9fa14d3
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/androidcamera/camera_wrapper/camera_wrapper.cpp
View File

@ -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:
{ {
} }
}; };
#endif
void debugShowFPS() void debugShowFPS()
{ {
@ -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
) )
{ {