Merge remote-tracking branch 'upstream/3.4' into merge-3.4

2018-09-10 00:04:29 +03:00
parent 80610ca054 c35c5a47df
commit dca657a2fd
107 changed files with 492 additions and 485 deletions
@@ -29,7 +29,7 @@ static void throwJavaException(JNIEnv *env, const std::exception *e, const char
  env->ThrowNew(je, what.c_str());

  LOGE("%s caught %s", method, what.c_str());
-  (void)method;        // avoid "unused" warning
+  CV_UNUSED(method);        // avoid "unused" warning
 }

 extern "C" {