merged the trunk r8704:8716

2012-06-28 16:13:29 +00:00
parent 2777ebb8a0
commit 680a44189c
83 changed files with 2402 additions and 2052 deletions
--- a/modules/androidcamera/src/camera_activity.cpp
+++ b/modules/androidcamera/src/camera_activity.cpp
@@ -340,7 +340,7 @@ CameraActivity::~CameraActivity()
        disconnect();
 }

-bool CameraActivity::onFrameBuffer(void* buffer, int bufferSize)
+bool CameraActivity::onFrameBuffer(void* /*buffer*/, int /*bufferSize*/)
 {
    LOGD("CameraActivity::onFrameBuffer - empty callback");
    return true;