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/samples/android/hello-android/main.cpp
+++ b/samples/android/hello-android/main.cpp
@@ -6,9 +6,10 @@ const char* message = "Hello Android!";

 int main(int argc, char* argv[])
 {
+  (void)argc; (void)argv;
  // print message to console
  printf("%s\n", message);
-  
+
  // put message to simple image
  Size textsize = getTextSize(message, CV_FONT_HERSHEY_COMPLEX, 3, 5, 0);
  Mat img(textsize.height + 20, textsize.width + 20, CV_32FC1, Scalar(230,230,230));